changeset 3998:12d2d28f86b8

RT-31083: only use font property if looking up font for converting font relative values
author David Grieve<david.grieve@oracle.com>
date Mon, 17 Jun 2013 19:31:36 -0400
parents ab5dd0cc19d8
children b4f3debd7092
files javafx-ui-common/src/javafx/scene/CssStyleHelper.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/src/javafx/scene/CssStyleHelper.java	Mon Jun 17 15:58:54 2013 +0100
+++ b/javafx-ui-common/src/javafx/scene/CssStyleHelper.java	Mon Jun 17 19:31:36 2013 -0400
@@ -1492,7 +1492,7 @@
         // use the font property's value if it was set by the user and
         // there is not an inline or author style.
 
-        if (cacheContainer.fontProp != null) {
+        if (lookupForFontCache && cacheContainer.fontProp != null) {
             StyleableProperty<Font> styleableProp = cacheContainer.fontProp.getStyleableProperty(styleable);
             StyleOrigin fpOrigin = styleableProp.getStyleOrigin();
             if (fpOrigin == StyleOrigin.USER) {