changeset 9950:a81b22e094d9 jdk-9+130

8160554: Wrong unit measure in CornerRadiiConverter
author jgiles
date Mon, 01 Aug 2016 13:00:07 +1200
parents ff2e48156643
children 132353e1145f 90e7d4314ecd
files modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/CornerRadiiConverter.java
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/CornerRadiiConverter.java	Fri Jul 29 14:36:57 2016 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/CornerRadiiConverter.java	Mon Aug 01 13:00:07 2016 +1200
@@ -69,10 +69,10 @@
             Size bottomLeftVerticalRadius = sizes[1][3].convert(font);
 
             cornerRadiiValues[n] = new CornerRadii(
-                    topLeftHorizontalRadius.pixels(),     topLeftVerticalRadius.pixels(),
-                    topRightVerticalRadius.pixels(),      topRightHorizontalRadius.pixels(),
-                    bottomRightHorizontalRadius.pixels(), bottomRightVerticalRadius.pixels(),
-                    bottomLeftVerticalRadius.pixels(),    bottomLeftHorizontalRadius.pixels(),
+                    topLeftHorizontalRadius.pixels(font),     topLeftVerticalRadius.pixels(font),
+                    topRightVerticalRadius.pixels(font),      topRightHorizontalRadius.pixels(font),
+                    bottomRightHorizontalRadius.pixels(font), bottomRightVerticalRadius.pixels(font),
+                    bottomLeftVerticalRadius.pixels(font),    bottomLeftHorizontalRadius.pixels(font),
                     topLeftHorizontalRadius.getUnits()     == SizeUnits.PERCENT, topLeftVerticalRadius.getUnits()      == SizeUnits.PERCENT,
                     topRightVerticalRadius.getUnits()      == SizeUnits.PERCENT, topRightHorizontalRadius.getUnits()   == SizeUnits.PERCENT,
                     bottomRightHorizontalRadius.getUnits() == SizeUnits.PERCENT, bottomRightVerticalRadius.getUnits()  == SizeUnits.PERCENT,