Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/themes/ThemeDocument.java @ 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 | 6b880df95a3a |
comparison
equal
deleted
inserted
replaced
7582:8ebca831486b | 7583:4b67eb1a3a68 |
---|---|
389 return Font.BOLD; | 389 return Font.BOLD; |
390 } | 390 } |
391 return Font.PLAIN; | 391 return Font.PLAIN; |
392 } | 392 } |
393 | 393 |
394 /** Handle info for label or annotation text. */ | |
394 public TextStyle parseComplexTextStyle() { | 395 public TextStyle parseComplexTextStyle() { |
396 Font font = parseTextFont(); | |
397 // Try the annotation text styles. | |
398 if (font == null) { | |
399 font = parseFont(); | |
400 } | |
395 return new TextStyle( | 401 return new TextStyle( |
396 parseTextColor(), | 402 parseTextColor(), |
397 parseTextFont(), | 403 font, |
398 parseTextBackground(), | 404 parseTextBackground(), |
399 parseLabelShowBackground(), | 405 parseLabelShowBackground(), |
400 !parseTextOrientation().equals("horizontal")); | 406 !parseTextOrientation().equals("horizontal")); |
401 } | 407 } |
402 | 408 |