Mercurial > dive4elements > river
changeset 7583:4b67eb1a3a68
issue1606: Handle annotation text as well.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 19 Nov 2013 10:20:27 +0100 |
| parents | 8ebca831486b |
| children | c7638c971574 |
| files | artifacts/src/main/java/org/dive4elements/river/themes/ThemeDocument.java |
| diffstat | 1 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/themes/ThemeDocument.java Tue Nov 19 10:19:25 2013 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/themes/ThemeDocument.java Tue Nov 19 10:20:27 2013 +0100 @@ -391,10 +391,16 @@ return Font.PLAIN; } + /** Handle info for label or annotation text. */ public TextStyle parseComplexTextStyle() { + Font font = parseTextFont(); + // Try the annotation text styles. + if (font == null) { + font = parseFont(); + } return new TextStyle( parseTextColor(), - parseTextFont(), + font, parseTextBackground(), parseLabelShowBackground(), !parseTextOrientation().equals("horizontal"));