joerg/graphics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use always trimmed text so that getSelectedFont() works

Browse source
This commit is contained in:
Jörg Prante 2024-10-18 14:39:18 +02:00
parent 0f3f8d488a
commit e81e605887
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -1,3 +1,3 @@
group = org.xbib.graphics group = org.xbib.graphics
name = graphics name = graphics
version = 5.5.2 version = 5.5.3

20
graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/text/StyledText.java
View file

@ -119,15 +119,14 @@ public class StyledText implements TextFragment {
return getFontDescriptor().getSize(); return getFontDescriptor().getSize();
} }
/**
* @return the ascent of the associated font.
* @throws IOException by pdfbox.
*/
public float getAscent() throws IOException { public float getAscent() throws IOException {
if (text == null || text.isEmpty()) { if (text == null) {
return 0f; return 0f;
} }
return getFontDescriptor().getSize() * getFontDescriptor().getSelectedFont(text).getFontDescriptor().getAscent() / 1000; if (text.trim().isEmpty()) {
return 0f;
}
return getFontDescriptor().getSize() * getFontDescriptor().getSelectedFont(text.trim()).getFontDescriptor().getAscent() / 1000;
} }
public float getBaselineOffset() { public float getBaselineOffset() {
@ -182,13 +181,16 @@ public class StyledText implements TextFragment {
} }
private static float getWidth(FontDescriptor fontDescriptor, String text) { private static float getWidth(FontDescriptor fontDescriptor, String text) {
if (text == null || text.isEmpty()) { if (text == null) {
return 0f;
}
if (text.trim().isEmpty()) {
return 0f; return 0f;
} }
try { try {
return fontDescriptor.getSize() * fontDescriptor.getSelectedFont(text).getStringWidth(text) / 1000; return fontDescriptor.getSize() * fontDescriptor.getSelectedFont(text.trim()).getStringWidth(text.trim()) / 1000;
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.WARNING, "text = " + text + " " + e.getMessage(), e); logger.log(Level.WARNING, "text = '" + text.trim() + "' " + e.getMessage(), e);
return 0f; return 0f;
} }
} }