1,2c1,2 < --- old/modules/graphics/src/main/java/javafx/stage/Screen.java 2016-03-29 21:01:12.000000000 -0700 < +++ new/modules/graphics/src/main/java/javafx/stage/Screen.java 2016-03-29 21:01:11.000000000 -0700 --- > --- old/modules/graphics/src/main/java/javafx/stage/Screen.java 2016-03-30 23:38:06.000000000 -0700 > +++ new/modules/graphics/src/main/java/javafx/stage/Screen.java 2016-03-30 23:38:05.000000000 -0700 136,137c136,137 < --- old/modules/graphics/src/main/java/javafx/stage/Window.java 2016-03-29 21:01:13.000000000 -0700 < +++ new/modules/graphics/src/main/java/javafx/stage/Window.java 2016-03-29 21:01:13.000000000 -0700 --- > --- old/modules/graphics/src/main/java/javafx/stage/Window.java 2016-03-30 23:38:07.000000000 -0700 > +++ new/modules/graphics/src/main/java/javafx/stage/Window.java 2016-03-30 23:38:07.000000000 -0700 442,443c442,443 < --- old/modules/graphics/src/main/java/javafx/scene/layout/Region.java 2016-03-29 21:01:14.000000000 -0700 < +++ new/modules/graphics/src/main/java/javafx/scene/layout/Region.java 2016-03-29 21:01:14.000000000 -0700 --- > --- old/modules/graphics/src/main/java/javafx/scene/layout/Region.java 2016-03-30 23:38:09.000000000 -0700 > +++ new/modules/graphics/src/main/java/javafx/scene/layout/Region.java 2016-03-30 23:38:08.000000000 -0700 1079,1081c1079,1173 < --- old/modules/controls/src/main/java/com/sun/javafx/scene/control/ContextMenuContent.java 2016-03-29 21:01:15.000000000 -0700 < +++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/ContextMenuContent.java 2016-03-29 21:01:15.000000000 -0700 < @@ -178,36 +178,36 @@ --- > --- old/apps/samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SubSceneResizer.java 2016-03-30 23:38:10.000000000 -0700 > +++ new/apps/samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SubSceneResizer.java 2016-03-30 23:38:10.000000000 -0700 > @@ -82,8 +82,8 @@ > subScene.setWidth(width); > subScene.setHeight(height); > } > - final int controlsWidth = (int)snapSize(controlsPanel.prefWidth(-1)); > - final int controlsHeight = (int)snapSize(controlsPanel.prefHeight(-1)); > + final double controlsWidth = snapSizeX(controlsPanel.prefWidth(-1)); > + final double controlsHeight = snapSizeY(controlsPanel.prefHeight(-1)); > controlsPanel.resizeRelocate(width-controlsWidth,0,controlsWidth,controlsHeight); > } > } > --- old/apps/samples/Ensemble8/src/app/java/ensemble/control/Popover.java 2016-03-30 23:38:11.000000000 -0700 > +++ new/apps/samples/Ensemble8/src/app/java/ensemble/control/Popover.java 2016-03-30 23:38:11.000000000 -0700 > @@ -33,7 +33,6 @@ > > import java.util.LinkedList; > > -import ensemble.EnsembleApp; > import javafx.animation.Animation; > import javafx.animation.FadeTransition; > import javafx.animation.Interpolator; > @@ -53,11 +52,9 @@ > import javafx.scene.Node; > import javafx.scene.Scene; > import javafx.scene.control.Button; > -import javafx.scene.image.Image; > import javafx.scene.input.MouseEvent; > import javafx.scene.layout.Pane; > import javafx.scene.layout.Region; > -import javafx.scene.paint.Color; > import javafx.scene.shape.Rectangle; > import javafx.scene.text.Text; > import javafx.util.Duration; > @@ -94,7 +91,7 @@ > // private final EventHandler popoverScrollHandler; > private final EventHandler popoverHideHandler; > private Runnable onHideCallback = null; > - private int maxPopupHeight = -1; > + private double maxPopupHeight = -1; > > private DoubleProperty popoverHeight = new SimpleDoubleProperty(400) { > @Override protected void invalidated() { > @@ -229,15 +226,15 @@ > maxPopupHeight = (int)getScene().getHeight()-100; > } > final Insets insets = getInsets(); > - final int width = (int)getWidth(); > - final int height = (int)getHeight(); > - final int top = (int)insets.getTop(); > - final int right = (int)insets.getRight(); > - final int bottom = (int)insets.getBottom(); > - final int left = (int)insets.getLeft(); > + final double width = getWidth(); > + final double height = getHeight(); > + final double top = insets.getTop(); > + final double right = insets.getRight(); > + final double bottom = insets.getBottom(); > + final double left = insets.getLeft(); > > - int pageWidth = width - left - right; > - int pageHeight = height - top - bottom; > + double pageWidth = width - left - right; > + double pageHeight = height - top - bottom; > > frameBorder.resize(width, height); > > @@ -245,18 +242,18 @@ > pagesClipRect.setWidth(pageWidth); > pagesClipRect.setHeight(pageHeight); > > - int pageX = 0; > + double pageX = 0; > for (Node page : pagesPane.getChildren()) { > page.resizeRelocate(pageX, 0, pageWidth, pageHeight); > pageX += pageWidth + PAGE_GAP; > } > > - int buttonHeight = (int)(leftButton.prefHeight(-1)); > + double buttonHeight = leftButton.prefHeight(-1); > if (buttonHeight < 30) buttonHeight = 30; > - final int buttonTop = (int)((top-buttonHeight)/2d); > - final int leftButtonWidth = (int)snapSize(leftButton.prefWidth(-1)); > + final double buttonTop = (top-buttonHeight) / 2.0; > + final double leftButtonWidth = snapSizeX(leftButton.prefWidth(-1)); > leftButton.resizeRelocate(left, buttonTop,leftButtonWidth,buttonHeight); > - final int rightButtonWidth = (int)snapSize(rightButton.prefWidth(-1)); > + final double rightButtonWidth = snapSizeX(rightButton.prefWidth(-1)); > rightButton.resizeRelocate(width-right-rightButtonWidth, buttonTop,rightButtonWidth,buttonHeight); > > final double leftButtonRight = leftButton.isVisible() ? (left + leftButtonWidth) : left; > --- old/modules/controls/src/main/java/com/sun/javafx/scene/control/ContextMenuContent.java 2016-03-30 23:38:13.000000000 -0700 > +++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/ContextMenuContent.java 2016-03-30 23:38:13.000000000 -0700 > @@ -177,36 +177,36 @@ 1126c1218 < @@ -334,7 +334,7 @@ --- > @@ -333,7 +333,7 @@ 1135c1227 < @@ -353,18 +353,18 @@ --- > @@ -352,18 +352,18 @@ 1161c1253 < @@ -376,16 +376,16 @@ --- > @@ -375,16 +375,16 @@ 1181c1273 < @@ -405,7 +405,7 @@ --- > @@ -404,7 +404,7 @@ 1190c1282 < @@ -414,7 +414,7 @@ --- > @@ -413,7 +413,7 @@ 1199c1291 < @@ -1007,8 +1007,8 @@ --- > @@ -1006,8 +1006,8 @@ 1210c1302 < @@ -1070,8 +1070,8 @@ --- > @@ -1069,8 +1069,8 @@ 1221,1222c1313,1314 < --- old/modules/controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java 2016-03-29 21:01:16.000000000 -0700 < +++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java 2016-03-29 21:01:16.000000000 -0700 --- > --- old/modules/controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java 2016-03-30 23:38:14.000000000 -0700 > +++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java 2016-03-30 23:38:14.000000000 -0700 1240,1241c1332,1333 < --- old/modules/controls/src/main/java/com/sun/javafx/scene/control/EmbeddedTextContextMenuContent.java 2016-03-29 21:01:18.000000000 -0700 < +++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/EmbeddedTextContextMenuContent.java 2016-03-29 21:01:17.000000000 -0700 --- > --- old/modules/controls/src/main/java/com/sun/javafx/scene/control/EmbeddedTextContextMenuContent.java 2016-03-30 23:38:15.000000000 -0700 > +++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/EmbeddedTextContextMenuContent.java 2016-03-30 23:38:15.000000000 -0700 1274,1275c1366,1367 < --- old/modules/controls/src/main/java/javafx/scene/chart/Chart.java 2016-03-29 21:01:19.000000000 -0700 < +++ new/modules/controls/src/main/java/javafx/scene/chart/Chart.java 2016-03-29 21:01:19.000000000 -0700 --- > --- old/modules/controls/src/main/java/javafx/scene/chart/Chart.java 2016-03-30 23:38:16.000000000 -0700 > +++ new/modules/controls/src/main/java/javafx/scene/chart/Chart.java 2016-03-30 23:38:16.000000000 -0700 1357,1358c1449,1450 < --- old/modules/controls/src/main/java/javafx/scene/chart/XYChart.java 2016-03-29 21:01:20.000000000 -0700 < +++ new/modules/controls/src/main/java/javafx/scene/chart/XYChart.java 2016-03-29 21:01:20.000000000 -0700 --- > --- old/modules/controls/src/main/java/javafx/scene/chart/XYChart.java 2016-03-30 23:38:17.000000000 -0700 > +++ new/modules/controls/src/main/java/javafx/scene/chart/XYChart.java 2016-03-30 23:38:17.000000000 -0700 1385,1386c1477,1478 < --- old/modules/controls/src/main/java/javafx/scene/control/Control.java 2016-03-29 21:01:21.000000000 -0700 < +++ new/modules/controls/src/main/java/javafx/scene/control/Control.java 2016-03-29 21:01:21.000000000 -0700 --- > --- old/modules/controls/src/main/java/javafx/scene/control/Control.java 2016-03-30 23:38:19.000000000 -0700 > +++ new/modules/controls/src/main/java/javafx/scene/control/Control.java 2016-03-30 23:38:19.000000000 -0700 1398,1399c1490,1491 < --- old/modules/controls/src/main/java/javafx/scene/control/DialogPane.java 2016-03-29 21:01:22.000000000 -0700 < +++ new/modules/controls/src/main/java/javafx/scene/control/DialogPane.java 2016-03-29 21:01:22.000000000 -0700 --- > --- old/modules/controls/src/main/java/javafx/scene/control/DialogPane.java 2016-03-30 23:38:20.000000000 -0700 > +++ new/modules/controls/src/main/java/javafx/scene/control/DialogPane.java 2016-03-30 23:38:20.000000000 -0700 1436,1437c1528,1529 < --- old/modules/controls/src/main/java/javafx/scene/control/skin/ColorPalette.java 2016-03-29 21:01:24.000000000 -0700 < +++ new/modules/controls/src/main/java/javafx/scene/control/skin/ColorPalette.java 2016-03-29 21:01:23.000000000 -0700 --- > --- old/modules/controls/src/main/java/javafx/scene/control/skin/ColorPalette.java 2016-03-30 23:38:22.000000000 -0700 > +++ new/modules/controls/src/main/java/javafx/scene/control/skin/ColorPalette.java 2016-03-30 23:38:22.000000000 -0700 1449,1450c1541,1542 < --- old/modules/controls/src/main/java/javafx/scene/control/skin/NestedTableColumnHeader.java 2016-03-29 21:01:25.000000000 -0700 < +++ new/modules/controls/src/main/java/javafx/scene/control/skin/NestedTableColumnHeader.java 2016-03-29 21:01:25.000000000 -0700 --- > --- old/modules/controls/src/main/java/javafx/scene/control/skin/NestedTableColumnHeader.java 2016-03-30 23:38:23.000000000 -0700 > +++ new/modules/controls/src/main/java/javafx/scene/control/skin/NestedTableColumnHeader.java 2016-03-30 23:38:23.000000000 -0700 1474,1475c1566,1567 < --- old/modules/controls/src/main/java/javafx/scene/control/skin/ScrollBarSkin.java 2016-03-29 21:01:26.000000000 -0700 < +++ new/modules/controls/src/main/java/javafx/scene/control/skin/ScrollBarSkin.java 2016-03-29 21:01:26.000000000 -0700 --- > --- old/modules/controls/src/main/java/javafx/scene/control/skin/ScrollBarSkin.java 2016-03-30 23:38:25.000000000 -0700 > +++ new/modules/controls/src/main/java/javafx/scene/control/skin/ScrollBarSkin.java 2016-03-30 23:38:24.000000000 -0700 1508,1509c1600,1601 < --- old/modules/controls/src/main/java/javafx/scene/control/skin/SplitPaneSkin.java 2016-03-29 21:01:27.000000000 -0700 < +++ new/modules/controls/src/main/java/javafx/scene/control/skin/SplitPaneSkin.java 2016-03-29 21:01:27.000000000 -0700 --- > --- old/modules/controls/src/main/java/javafx/scene/control/skin/SplitPaneSkin.java 2016-03-30 23:38:26.000000000 -0700 > +++ new/modules/controls/src/main/java/javafx/scene/control/skin/SplitPaneSkin.java 2016-03-30 23:38:26.000000000 -0700 1524,1525c1616,1617 < --- old/modules/controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java 2016-03-29 21:01:28.000000000 -0700 < +++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java 2016-03-29 21:01:28.000000000 -0700 --- > --- old/modules/controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java 2016-03-30 23:38:27.000000000 -0700 > +++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java 2016-03-30 23:38:27.000000000 -0700 1535,1536c1627,1628 < --- old/modules/controls/src/main/java/javafx/scene/control/skin/TableHeaderRow.java 2016-03-29 21:01:30.000000000 -0700 < +++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableHeaderRow.java 2016-03-29 21:01:29.000000000 -0700 --- > --- old/modules/controls/src/main/java/javafx/scene/control/skin/TableHeaderRow.java 2016-03-30 23:38:28.000000000 -0700 > +++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableHeaderRow.java 2016-03-30 23:38:28.000000000 -0700 1560,1561c1652,1653 < --- old/modules/controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java 2016-03-29 21:01:31.000000000 -0700 < +++ new/modules/controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java 2016-03-29 21:01:31.000000000 -0700 --- > --- old/modules/controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java 2016-03-30 23:38:29.000000000 -0700 > +++ new/modules/controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java 2016-03-30 23:38:29.000000000 -0700 1596,1597c1688,1689 < --- old/modules/graphics/src/main/java/com/sun/glass/events/WindowEvent.java 2016-03-29 21:01:32.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/events/WindowEvent.java 2016-03-29 21:01:32.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/events/WindowEvent.java 2016-03-30 23:38:30.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/events/WindowEvent.java 2016-03-30 23:38:30.000000000 -0700 1615,1616c1707,1708 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/Application.java 2016-03-29 21:01:33.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/Application.java 2016-03-29 21:01:33.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/Application.java 2016-03-30 23:38:32.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/Application.java 2016-03-30 23:38:31.000000000 -0700 1647,1648c1739,1740 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/Pixels.java 2016-03-29 21:01:34.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/Pixels.java 2016-03-29 21:01:34.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/Pixels.java 2016-03-30 23:38:33.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/Pixels.java 2016-03-30 23:38:33.000000000 -0700 1715,1716c1807,1808 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/Screen.java 2016-03-29 21:01:35.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/Screen.java 2016-03-29 21:01:35.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/Screen.java 2016-03-30 23:38:34.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/Screen.java 2016-03-30 23:38:34.000000000 -0700 1964,1965c2056,2057 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/Window.java 2016-03-29 21:01:37.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/Window.java 2016-03-29 21:01:36.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/Window.java 2016-03-30 23:38:35.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/Window.java 2016-03-30 23:38:35.000000000 -0700 2091,2092c2183,2184 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java 2016-03-29 21:01:38.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java 2016-03-29 21:01:38.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java 2016-03-30 23:38:37.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkApplication.java 2016-03-30 23:38:37.000000000 -0700 2104,2105c2196,2197 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkPixels.java 2016-03-29 21:01:39.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkPixels.java 2016-03-29 21:01:39.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkPixels.java 2016-03-30 23:38:38.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/gtk/GtkPixels.java 2016-03-30 23:38:38.000000000 -0700 2117,2118c2209,2210 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java 2016-03-29 21:01:40.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java 2016-03-29 21:01:40.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java 2016-03-30 23:38:40.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java 2016-03-30 23:38:39.000000000 -0700 2130,2131c2222,2223 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosPixels.java 2016-03-29 21:01:41.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosPixels.java 2016-03-29 21:01:41.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosPixels.java 2016-03-30 23:38:41.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosPixels.java 2016-03-30 23:38:41.000000000 -0700 2143,2144c2235,2236 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensApplication.java 2016-03-29 21:01:42.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensApplication.java 2016-03-29 21:01:42.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensApplication.java 2016-03-30 23:38:42.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensApplication.java 2016-03-30 23:38:42.000000000 -0700 2156,2157c2248,2249 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensPixels.java 2016-03-29 21:01:44.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensPixels.java 2016-03-29 21:01:43.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensPixels.java 2016-03-30 23:38:44.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/lens/LensPixels.java 2016-03-30 23:38:43.000000000 -0700 2169,2170c2261,2262 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java 2016-03-29 21:01:45.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java 2016-03-29 21:01:45.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java 2016-03-30 23:38:45.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java 2016-03-30 23:38:45.000000000 -0700 2182,2183c2274,2275 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacPixels.java 2016-03-29 21:01:46.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacPixels.java 2016-03-29 21:01:46.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacPixels.java 2016-03-30 23:38:46.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacPixels.java 2016-03-30 23:38:46.000000000 -0700 2195,2196c2287,2288 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacView.java 2016-03-29 21:01:47.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacView.java 2016-03-29 21:01:47.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacView.java 2016-03-30 23:38:47.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacView.java 2016-03-30 23:38:47.000000000 -0700 2264,2265c2356,2357 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacWindow.java 2016-03-29 21:01:48.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacWindow.java 2016-03-29 21:01:48.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacWindow.java 2016-03-30 23:38:48.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacWindow.java 2016-03-30 23:38:48.000000000 -0700 2331,2332c2423,2424 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java 2016-03-29 21:01:49.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java 2016-03-29 21:01:49.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java 2016-03-30 23:38:50.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java 2016-03-30 23:38:50.000000000 -0700 2409,2410c2501,2502 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonoclePixels.java 2016-03-29 21:01:51.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonoclePixels.java 2016-03-29 21:01:50.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonoclePixels.java 2016-03-30 23:38:51.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonoclePixels.java 2016-03-30 23:38:51.000000000 -0700 2422,2424c2514,2571 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java 2016-03-29 21:01:52.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java 2016-03-29 21:01:51.000000000 -0700 < @@ -269,8 +269,8 @@ --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java 2016-03-30 23:38:52.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java 2016-03-30 23:38:52.000000000 -0700 > @@ -38,9 +38,6 @@ > > final class WinApplication extends Application implements InvokeLaterDispatcher.InvokeLaterSubmitter { > static float overrideUIScale; > - static float overrideRenderScale; > - static float minDPIScale; > - static boolean forceIntegerRenderScale; > > private static boolean getBoolean(String propname, boolean defval, String description) { > String str = System.getProperty(propname); > @@ -80,10 +77,7 @@ > return val; > } > > - private static native void initIDs(float overrideUIScale, > - float overrideRenderScale, > - float minDPIScale, > - boolean forceIntegerRenderScale); > + private static native void initIDs(float overrideUIScale); > static { > // This loading of msvcr120.dll and msvcp120.dll (VS2013) is required when run with Java 8 > // since it was build with VS2010 and doesn't include msvcr120.dll in its JRE. > @@ -93,13 +87,17 @@ > verbose = Boolean.getBoolean("javafx.verbose"); > if (PrismSettings.allowHiDPIScaling) { > overrideUIScale = getFloat("glass.win.uiScale", -1.0f, "Forcing UI scaling factor: "); > - overrideRenderScale = getFloat("glass.win.renderScale", -1.0f, "Forcing Rendering scaling factor: "); > - minDPIScale = getFloat("glass.win.minHiDPI", 1.5f, "Threshold to enable UI scaling factor: "); > - forceIntegerRenderScale = getBoolean("glass.win.forceIntegerRenderScale", true, "forcing integer rendering scale"); > + // We only parse these if verbose, to inform the user... > + if (PrismSettings.verbose) { > + getFloat("glass.win.renderScale", -1.0f, > + "(No longer supported) Rendering scaling factor: "); > + getFloat("glass.win.minHiDPI", 1.5f, > + "(No longer supported) UI scaling threshold: "); > + getBoolean("glass.win.forceIntegerRenderScale", true, > + "(No longer supported) force integer rendering scale"); > + } > } else { > - overrideUIScale = overrideRenderScale = 1.0f; > - minDPIScale = Float.MAX_VALUE; > - forceIntegerRenderScale = false; > + overrideUIScale = 1.0f; > } > try { > NativeLibLoader.loadLibrary("msvcr120"); > @@ -119,7 +117,7 @@ > return null; > } > }); > - initIDs(overrideUIScale, overrideRenderScale, minDPIScale, forceIntegerRenderScale); > + initIDs(overrideUIScale); > } > > private final InvokeLaterDispatcher invokeLaterDispatcher; > @@ -269,8 +267,8 @@ 2435,2436c2582,2583 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/win/WinPixels.java 2016-03-29 21:01:53.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/win/WinPixels.java 2016-03-29 21:01:53.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/win/WinPixels.java 2016-03-30 23:38:54.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/win/WinPixels.java 2016-03-30 23:38:53.000000000 -0700 2448,2449c2595,2596 < --- old/modules/graphics/src/main/java/com/sun/glass/ui/win/WinWindow.java 2016-03-29 21:01:54.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/glass/ui/win/WinWindow.java 2016-03-29 21:01:54.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/glass/ui/win/WinWindow.java 2016-03-30 23:38:55.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/glass/ui/win/WinWindow.java 2016-03-30 23:38:55.000000000 -0700 2470,2471c2617,2618 < --- old/modules/graphics/src/main/java/com/sun/javafx/embed/EmbeddedSceneInterface.java 2016-03-29 21:01:55.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/embed/EmbeddedSceneInterface.java 2016-03-29 21:01:55.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/embed/EmbeddedSceneInterface.java 2016-03-30 23:38:56.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/embed/EmbeddedSceneInterface.java 2016-03-30 23:38:56.000000000 -0700 2481,2483c2628,2639 < --- old/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java 2016-03-29 21:01:56.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java 2016-03-29 21:01:56.000000000 -0700 < @@ -1908,7 +1908,7 @@ --- > --- old/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java 2016-03-30 23:38:57.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java 2016-03-30 23:38:57.000000000 -0700 > @@ -1899,7 +1899,7 @@ > } > > static native int getLCDContrastWin32(); > - private static native int getSystemFontSizeNative(); > + private static native float getSystemFontSizeNative(); > private static native String getSystemFontNative(); > private static float systemFontSize; > private static String systemFontFamily = null; > @@ -1908,8 +1908,7 @@ 2488,2489c2644,2645 < + float uiScale = Screen.getMainScreen().getPlatformScaleY(); < systemFontSize = getSystemFontSizeNative() / uiScale; --- > - systemFontSize = getSystemFontSizeNative() / uiScale; > + systemFontSize = getSystemFontSizeNative(); 2492,2493c2648,2650 < --- old/modules/graphics/src/main/java/com/sun/javafx/sg/prism/CacheFilter.java 2016-03-29 21:01:57.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/sg/prism/CacheFilter.java 2016-03-29 21:01:57.000000000 -0700 --- > } else if (isAndroid) { > --- old/modules/graphics/src/main/java/com/sun/javafx/sg/prism/CacheFilter.java 2016-03-30 23:38:59.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/sg/prism/CacheFilter.java 2016-03-30 23:38:59.000000000 -0700 2537,2538c2694,2695 < --- old/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGCanvas.java 2016-03-29 21:01:59.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGCanvas.java 2016-03-29 21:01:58.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGCanvas.java 2016-03-30 23:39:00.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGCanvas.java 2016-03-30 23:39:00.000000000 -0700 2560,2561c2717,2718 < --- old/modules/graphics/src/main/java/com/sun/javafx/stage/WindowHelper.java 2016-03-29 21:02:00.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/stage/WindowHelper.java 2016-03-29 21:02:00.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/stage/WindowHelper.java 2016-03-30 23:39:01.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/stage/WindowHelper.java 2016-03-30 23:39:01.000000000 -0700 2588,2589c2745,2746 < --- old/modules/graphics/src/main/java/com/sun/javafx/stage/WindowPeerListener.java 2016-03-29 21:02:01.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/stage/WindowPeerListener.java 2016-03-29 21:02:01.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/stage/WindowPeerListener.java 2016-03-30 23:39:03.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/stage/WindowPeerListener.java 2016-03-30 23:39:02.000000000 -0700 2602,2603c2759,2760 < --- old/modules/graphics/src/main/java/com/sun/javafx/tk/AppletWindow.java 2016-03-29 21:02:02.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/AppletWindow.java 2016-03-29 21:02:02.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/tk/AppletWindow.java 2016-03-30 23:39:04.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/AppletWindow.java 2016-03-30 23:39:04.000000000 -0700 2614,2615c2771,2772 < --- old/modules/graphics/src/main/java/com/sun/javafx/tk/ScreenConfigurationAccessor.java 2016-03-29 21:02:03.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/ScreenConfigurationAccessor.java 2016-03-29 21:02:03.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/tk/ScreenConfigurationAccessor.java 2016-03-30 23:39:05.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/ScreenConfigurationAccessor.java 2016-03-30 23:39:05.000000000 -0700 2625,2626c2782,2783 < --- old/modules/graphics/src/main/java/com/sun/javafx/tk/TKStage.java 2016-03-29 21:02:04.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/TKStage.java 2016-03-29 21:02:04.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/tk/TKStage.java 2016-03-30 23:39:07.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/TKStage.java 2016-03-30 23:39:06.000000000 -0700 2649,2650c2806,2807 < --- old/modules/graphics/src/main/java/com/sun/javafx/tk/TKStageListener.java 2016-03-29 21:02:06.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/TKStageListener.java 2016-03-29 21:02:05.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/tk/TKStageListener.java 2016-03-30 23:39:08.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/TKStageListener.java 2016-03-30 23:39:07.000000000 -0700 2666,2667c2823,2824 < --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java 2016-03-29 21:02:07.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java 2016-03-29 21:02:06.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java 2016-03-30 23:39:09.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedScene.java 2016-03-30 23:39:09.000000000 -0700 2740,2741c2897,2898 < --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java 2016-03-29 21:02:08.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java 2016-03-29 21:02:08.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java 2016-03-30 23:39:10.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedStage.java 2016-03-30 23:39:10.000000000 -0700 2797,2798c2954,2955 < --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedState.java 2016-03-29 21:02:09.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedState.java 2016-03-29 21:02:09.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedState.java 2016-03-30 23:39:11.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/EmbeddedState.java 2016-03-30 23:39:11.000000000 -0700 2811,2812c2968,2969 < --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassAppletWindow.java 2016-03-29 21:02:10.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassAppletWindow.java 2016-03-29 21:02:10.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassAppletWindow.java 2016-03-30 23:39:12.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassAppletWindow.java 2016-03-30 23:39:12.000000000 -0700 2835,2836c2992,2993 < --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java 2016-03-29 21:02:11.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java 2016-03-29 21:02:11.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java 2016-03-30 23:39:13.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSceneDnDEventHandler.java 2016-03-30 23:39:13.000000000 -0700 2916,2917c3073,3074 < --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java 2016-03-29 21:02:12.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java 2016-03-29 21:02:12.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java 2016-03-30 23:39:15.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassViewEventHandler.java 2016-03-30 23:39:14.000000000 -0700 3107,3108c3264,3265 < --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassWindowEventHandler.java 2016-03-29 21:02:14.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassWindowEventHandler.java 2016-03-29 21:02:13.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassWindowEventHandler.java 2016-03-30 23:39:16.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassWindowEventHandler.java 2016-03-30 23:39:16.000000000 -0700 3170,3171c3327,3328 < --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java 2016-03-29 21:02:15.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java 2016-03-29 21:02:15.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java 2016-03-30 23:39:17.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumToolkit.java 2016-03-30 23:39:17.000000000 -0700 3209,3210c3366,3367 < --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/UploadingPainter.java 2016-03-29 21:02:16.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/UploadingPainter.java 2016-03-29 21:02:16.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/UploadingPainter.java 2016-03-30 23:39:18.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/UploadingPainter.java 2016-03-30 23:39:18.000000000 -0700 3292,3293c3449,3450 < --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ViewPainter.java 2016-03-29 21:02:17.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ViewPainter.java 2016-03-29 21:02:17.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ViewPainter.java 2016-03-30 23:39:19.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/ViewPainter.java 2016-03-30 23:39:19.000000000 -0700 3360,3361c3517,3518 < --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java 2016-03-29 21:02:18.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java 2016-03-29 21:02:18.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java 2016-03-30 23:39:21.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java 2016-03-30 23:39:20.000000000 -0700 3523,3524c3680,3681 < --- old/modules/graphics/src/main/java/com/sun/prism/Graphics.java 2016-03-29 21:02:20.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/prism/Graphics.java 2016-03-29 21:02:19.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/prism/Graphics.java 2016-03-30 23:39:22.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/prism/Graphics.java 2016-03-30 23:39:22.000000000 -0700 3535,3536c3692,3693 < --- old/modules/graphics/src/main/java/com/sun/prism/Presentable.java 2016-03-29 21:02:21.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/prism/Presentable.java 2016-03-29 21:02:21.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/prism/Presentable.java 2016-03-30 23:39:23.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/prism/Presentable.java 2016-03-30 23:39:23.000000000 -0700 3545,3546c3702,3703 < --- old/modules/graphics/src/main/java/com/sun/prism/PresentableState.java 2016-03-29 21:02:22.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/prism/PresentableState.java 2016-03-29 21:02:22.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/prism/PresentableState.java 2016-03-30 23:39:24.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/prism/PresentableState.java 2016-03-30 23:39:24.000000000 -0700 3643,3644c3800,3801 < --- old/modules/graphics/src/main/java/com/sun/prism/d3d/D3DContext.java 2016-03-29 21:02:23.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/prism/d3d/D3DContext.java 2016-03-29 21:02:23.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/prism/d3d/D3DContext.java 2016-03-30 23:39:25.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/prism/d3d/D3DContext.java 2016-03-30 23:39:25.000000000 -0700 3672,3673c3829,3830 < --- old/modules/graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java 2016-03-29 21:02:24.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java 2016-03-29 21:02:24.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java 2016-03-30 23:39:26.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/prism/d3d/D3DResourceFactory.java 2016-03-30 23:39:26.000000000 -0700 3683,3684c3840,3841 < --- old/modules/graphics/src/main/java/com/sun/prism/d3d/D3DSwapChain.java 2016-03-29 21:02:25.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/prism/d3d/D3DSwapChain.java 2016-03-29 21:02:25.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/prism/d3d/D3DSwapChain.java 2016-03-30 23:39:27.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/prism/d3d/D3DSwapChain.java 2016-03-30 23:39:27.000000000 -0700 3739,3740c3896,3897 < --- old/modules/graphics/src/main/java/com/sun/prism/es2/ES2Context.java 2016-03-29 21:02:26.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/prism/es2/ES2Context.java 2016-03-29 21:02:26.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/prism/es2/ES2Context.java 2016-03-30 23:39:29.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/prism/es2/ES2Context.java 2016-03-30 23:39:28.000000000 -0700 3769,3770c3926,3927 < --- old/modules/graphics/src/main/java/com/sun/prism/es2/ES2SwapChain.java 2016-03-29 21:02:28.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/prism/es2/ES2SwapChain.java 2016-03-29 21:02:27.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/prism/es2/ES2SwapChain.java 2016-03-30 23:39:30.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/prism/es2/ES2SwapChain.java 2016-03-30 23:39:30.000000000 -0700 3829,3830c3986,3987 < --- old/modules/graphics/src/main/java/com/sun/prism/impl/BaseGraphics.java 2016-03-29 21:02:29.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/prism/impl/BaseGraphics.java 2016-03-29 21:02:29.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/prism/impl/BaseGraphics.java 2016-03-30 23:39:31.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/prism/impl/BaseGraphics.java 2016-03-30 23:39:31.000000000 -0700 3865,3866c4022,4023 < --- old/modules/graphics/src/main/java/com/sun/prism/impl/QueuedPixelSource.java 2016-03-29 21:02:30.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/prism/impl/QueuedPixelSource.java 2016-03-29 21:02:30.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/prism/impl/QueuedPixelSource.java 2016-03-30 23:39:32.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/prism/impl/QueuedPixelSource.java 2016-03-30 23:39:32.000000000 -0700 3900,3901c4057,4058 < --- old/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPresentable.java 2016-03-29 21:02:31.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPresentable.java 2016-03-29 21:02:31.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPresentable.java 2016-03-30 23:39:33.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPresentable.java 2016-03-30 23:39:33.000000000 -0700 3926,3927c4083,4084 < --- old/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPrismGraphics.java 2016-03-29 21:02:32.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPrismGraphics.java 2016-03-29 21:02:32.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPrismGraphics.java 2016-03-30 23:39:34.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/prism/j2d/J2DPrismGraphics.java 2016-03-30 23:39:34.000000000 -0700 3962,3963c4119,4120 < --- old/modules/graphics/src/main/java/com/sun/prism/null3d/DummySwapChain.java 2016-03-29 21:02:33.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/prism/null3d/DummySwapChain.java 2016-03-29 21:02:33.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/prism/null3d/DummySwapChain.java 2016-03-30 23:39:35.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/prism/null3d/DummySwapChain.java 2016-03-30 23:39:35.000000000 -0700 3979,3980c4136,4137 < --- old/modules/graphics/src/main/java/com/sun/prism/sw/SWGraphics.java 2016-03-29 21:02:35.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/prism/sw/SWGraphics.java 2016-03-29 21:02:34.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/prism/sw/SWGraphics.java 2016-03-30 23:39:37.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/prism/sw/SWGraphics.java 2016-03-30 23:39:36.000000000 -0700 4014,4015c4171,4172 < --- old/modules/graphics/src/main/java/com/sun/prism/sw/SWPresentable.java 2016-03-29 21:02:36.000000000 -0700 < +++ new/modules/graphics/src/main/java/com/sun/prism/sw/SWPresentable.java 2016-03-29 21:02:36.000000000 -0700 --- > --- old/modules/graphics/src/main/java/com/sun/prism/sw/SWPresentable.java 2016-03-30 23:39:38.000000000 -0700 > +++ new/modules/graphics/src/main/java/com/sun/prism/sw/SWPresentable.java 2016-03-30 23:39:37.000000000 -0700 4042,4043c4199,4200 < --- old/modules/graphics/src/main/java/javafx/scene/layout/BorderPane.java 2016-03-29 21:02:37.000000000 -0700 < +++ new/modules/graphics/src/main/java/javafx/scene/layout/BorderPane.java 2016-03-29 21:02:37.000000000 -0700 --- > --- old/modules/graphics/src/main/java/javafx/scene/layout/BorderPane.java 2016-03-30 23:39:39.000000000 -0700 > +++ new/modules/graphics/src/main/java/javafx/scene/layout/BorderPane.java 2016-03-30 23:39:39.000000000 -0700 4120,4121c4277,4278 < --- old/modules/graphics/src/main/java/javafx/scene/layout/FlowPane.java 2016-03-29 21:02:38.000000000 -0700 < +++ new/modules/graphics/src/main/java/javafx/scene/layout/FlowPane.java 2016-03-29 21:02:38.000000000 -0700 --- > --- old/modules/graphics/src/main/java/javafx/scene/layout/FlowPane.java 2016-03-30 23:39:40.000000000 -0700 > +++ new/modules/graphics/src/main/java/javafx/scene/layout/FlowPane.java 2016-03-30 23:39:40.000000000 -0700 4205,4206c4362,4363 < --- old/modules/graphics/src/main/java/javafx/scene/layout/GridPane.java 2016-03-29 21:02:39.000000000 -0700 < +++ new/modules/graphics/src/main/java/javafx/scene/layout/GridPane.java 2016-03-29 21:02:39.000000000 -0700 --- > --- old/modules/graphics/src/main/java/javafx/scene/layout/GridPane.java 2016-03-30 23:39:41.000000000 -0700 > +++ new/modules/graphics/src/main/java/javafx/scene/layout/GridPane.java 2016-03-30 23:39:41.000000000 -0700 4447,4448c4604,4605 < --- old/modules/graphics/src/main/java/javafx/scene/layout/HBox.java 2016-03-29 21:02:41.000000000 -0700 < +++ new/modules/graphics/src/main/java/javafx/scene/layout/HBox.java 2016-03-29 21:02:40.000000000 -0700 --- > --- old/modules/graphics/src/main/java/javafx/scene/layout/HBox.java 2016-03-30 23:39:42.000000000 -0700 > +++ new/modules/graphics/src/main/java/javafx/scene/layout/HBox.java 2016-03-30 23:39:42.000000000 -0700 4554,4555c4711,4712 < --- old/modules/graphics/src/main/java/javafx/scene/layout/TilePane.java 2016-03-29 21:02:42.000000000 -0700 < +++ new/modules/graphics/src/main/java/javafx/scene/layout/TilePane.java 2016-03-29 21:02:42.000000000 -0700 --- > --- old/modules/graphics/src/main/java/javafx/scene/layout/TilePane.java 2016-03-30 23:39:44.000000000 -0700 > +++ new/modules/graphics/src/main/java/javafx/scene/layout/TilePane.java 2016-03-30 23:39:44.000000000 -0700 4663,4664c4820,4821 < --- old/modules/graphics/src/main/java/javafx/scene/layout/VBox.java 2016-03-29 21:02:43.000000000 -0700 < +++ new/modules/graphics/src/main/java/javafx/scene/layout/VBox.java 2016-03-29 21:02:43.000000000 -0700 --- > --- old/modules/graphics/src/main/java/javafx/scene/layout/VBox.java 2016-03-30 23:39:45.000000000 -0700 > +++ new/modules/graphics/src/main/java/javafx/scene/layout/VBox.java 2016-03-30 23:39:45.000000000 -0700 4762,4763c4919,4920 < --- old/modules/graphics/src/main/java/javafx/scene/text/TextFlow.java 2016-03-29 21:02:44.000000000 -0700 < +++ new/modules/graphics/src/main/java/javafx/scene/text/TextFlow.java 2016-03-29 21:02:44.000000000 -0700 --- > --- old/modules/graphics/src/main/java/javafx/scene/text/TextFlow.java 2016-03-30 23:39:47.000000000 -0700 > +++ new/modules/graphics/src/main/java/javafx/scene/text/TextFlow.java 2016-03-30 23:39:47.000000000 -0700 4856,4857c5013,5039 < --- old/modules/graphics/src/main/native-glass/gtk/glass_general.cpp 2016-03-29 21:02:45.000000000 -0700 < +++ new/modules/graphics/src/main/native-glass/gtk/glass_general.cpp 2016-03-29 21:02:45.000000000 -0700 --- > --- old/modules/graphics/src/main/native-font/fontpath.c 2016-03-30 23:39:48.000000000 -0700 > +++ new/modules/graphics/src/main/native-font/fontpath.c 2016-03-30 23:39:48.000000000 -0700 > @@ -735,15 +735,19 @@ > &fontSmoothingContrast, 0) ? fontSmoothingContrast : fontSmoothingContrastDefault; > } > > -JNIEXPORT jint JNICALL > +JNIEXPORT jfloat JNICALL > Java_com_sun_javafx_font_PrismFontFactory_getSystemFontSizeNative(JNIEnv *env, jclass cl) > { > NONCLIENTMETRICSW ncmetrics; > > if (getSysParams(&ncmetrics)) { > - return -ncmetrics.lfMessageFont.lfHeight; > + HWND hWnd = GetDesktopWindow(); > + HDC hDC = GetDC(hWnd); > + int dpiY = GetDeviceCaps(hDC, LOGPIXELSY); > + ReleaseDC(hWnd, hDC); > + return (-ncmetrics.lfMessageFont.lfHeight) * 96.0f / dpiY; > } else { > - return 12; > + return 12.0f; > } > } > > --- old/modules/graphics/src/main/native-glass/gtk/glass_general.cpp 2016-03-30 23:39:50.000000000 -0700 > +++ new/modules/graphics/src/main/native-glass/gtk/glass_general.cpp 2016-03-30 23:39:49.000000000 -0700 4867,4868c5049,5050 < --- old/modules/graphics/src/main/native-glass/gtk/glass_screen.cpp 2016-03-29 21:02:47.000000000 -0700 < +++ new/modules/graphics/src/main/native-glass/gtk/glass_screen.cpp 2016-03-29 21:02:46.000000000 -0700 --- > --- old/modules/graphics/src/main/native-glass/gtk/glass_screen.cpp 2016-03-30 23:39:51.000000000 -0700 > +++ new/modules/graphics/src/main/native-glass/gtk/glass_screen.cpp 2016-03-30 23:39:51.000000000 -0700 4890,4891c5072,5073 < --- old/modules/graphics/src/main/native-glass/ios/GlassScreen.m 2016-03-29 21:02:48.000000000 -0700 < +++ new/modules/graphics/src/main/native-glass/ios/GlassScreen.m 2016-03-29 21:02:48.000000000 -0700 --- > --- old/modules/graphics/src/main/native-glass/ios/GlassScreen.m 2016-03-30 23:39:52.000000000 -0700 > +++ new/modules/graphics/src/main/native-glass/ios/GlassScreen.m 2016-03-30 23:39:52.000000000 -0700 4925,4926c5107,5108 < --- old/modules/graphics/src/main/native-glass/lens/LensScreen.c 2016-03-29 21:02:49.000000000 -0700 < +++ new/modules/graphics/src/main/native-glass/lens/LensScreen.c 2016-03-29 21:02:49.000000000 -0700 --- > --- old/modules/graphics/src/main/native-glass/lens/LensScreen.c 2016-03-30 23:39:54.000000000 -0700 > +++ new/modules/graphics/src/main/native-glass/lens/LensScreen.c 2016-03-30 23:39:53.000000000 -0700 4957,4958c5139,5140 < --- old/modules/graphics/src/main/native-glass/mac/GlassApplication.m 2016-03-29 21:02:50.000000000 -0700 < +++ new/modules/graphics/src/main/native-glass/mac/GlassApplication.m 2016-03-29 21:02:50.000000000 -0700 --- > --- old/modules/graphics/src/main/native-glass/mac/GlassApplication.m 2016-03-30 23:39:55.000000000 -0700 > +++ new/modules/graphics/src/main/native-glass/mac/GlassApplication.m 2016-03-30 23:39:55.000000000 -0700 4968,4969c5150,5151 < --- old/modules/graphics/src/main/native-glass/mac/GlassRobot.m 2016-03-29 21:02:51.000000000 -0700 < +++ new/modules/graphics/src/main/native-glass/mac/GlassRobot.m 2016-03-29 21:02:51.000000000 -0700 --- > --- old/modules/graphics/src/main/native-glass/mac/GlassRobot.m 2016-03-30 23:39:56.000000000 -0700 > +++ new/modules/graphics/src/main/native-glass/mac/GlassRobot.m 2016-03-30 23:39:56.000000000 -0700 4979,4980c5161,5162 < --- old/modules/graphics/src/main/native-glass/mac/GlassScreen.m 2016-03-29 21:02:52.000000000 -0700 < +++ new/modules/graphics/src/main/native-glass/mac/GlassScreen.m 2016-03-29 21:02:52.000000000 -0700 --- > --- old/modules/graphics/src/main/native-glass/mac/GlassScreen.m 2016-03-30 23:39:57.000000000 -0700 > +++ new/modules/graphics/src/main/native-glass/mac/GlassScreen.m 2016-03-30 23:39:57.000000000 -0700 5020,5021c5202,5203 < --- old/modules/graphics/src/main/native-glass/mac/GlassView.h 2016-03-29 21:02:54.000000000 -0700 < +++ new/modules/graphics/src/main/native-glass/mac/GlassView.h 2016-03-29 21:02:53.000000000 -0700 --- > --- old/modules/graphics/src/main/native-glass/mac/GlassView.h 2016-03-30 23:39:58.000000000 -0700 > +++ new/modules/graphics/src/main/native-glass/mac/GlassView.h 2016-03-30 23:39:58.000000000 -0700 5031,5032c5213,5214 < --- old/modules/graphics/src/main/native-glass/mac/GlassView.m 2016-03-29 21:02:55.000000000 -0700 < +++ new/modules/graphics/src/main/native-glass/mac/GlassView.m 2016-03-29 21:02:54.000000000 -0700 --- > --- old/modules/graphics/src/main/native-glass/mac/GlassView.m 2016-03-30 23:39:59.000000000 -0700 > +++ new/modules/graphics/src/main/native-glass/mac/GlassView.m 2016-03-30 23:39:59.000000000 -0700 5087,5088c5269,5270 < --- old/modules/graphics/src/main/native-glass/mac/GlassView2D.m 2016-03-29 21:02:56.000000000 -0700 < +++ new/modules/graphics/src/main/native-glass/mac/GlassView2D.m 2016-03-29 21:02:56.000000000 -0700 --- > --- old/modules/graphics/src/main/native-glass/mac/GlassView2D.m 2016-03-30 23:40:01.000000000 -0700 > +++ new/modules/graphics/src/main/native-glass/mac/GlassView2D.m 2016-03-30 23:40:01.000000000 -0700 5107,5108c5289,5290 < --- old/modules/graphics/src/main/native-glass/mac/GlassView3D.m 2016-03-29 21:02:57.000000000 -0700 < +++ new/modules/graphics/src/main/native-glass/mac/GlassView3D.m 2016-03-29 21:02:57.000000000 -0700 --- > --- old/modules/graphics/src/main/native-glass/mac/GlassView3D.m 2016-03-30 23:40:02.000000000 -0700 > +++ new/modules/graphics/src/main/native-glass/mac/GlassView3D.m 2016-03-30 23:40:02.000000000 -0700 5129,5130c5311,5312 < --- old/modules/graphics/src/main/native-glass/mac/GlassWindow.m 2016-03-29 21:02:58.000000000 -0700 < +++ new/modules/graphics/src/main/native-glass/mac/GlassWindow.m 2016-03-29 21:02:58.000000000 -0700 --- > --- old/modules/graphics/src/main/native-glass/mac/GlassWindow.m 2016-03-30 23:40:03.000000000 -0700 > +++ new/modules/graphics/src/main/native-glass/mac/GlassWindow.m 2016-03-30 23:40:03.000000000 -0700 5140,5141c5322,5380 < --- old/modules/graphics/src/main/native-glass/win/GlassScreen.cpp 2016-03-29 21:02:59.000000000 -0700 < +++ new/modules/graphics/src/main/native-glass/win/GlassScreen.cpp 2016-03-29 21:02:59.000000000 -0700 --- > --- old/modules/graphics/src/main/native-glass/win/GlassApplication.cpp 2016-03-30 23:40:05.000000000 -0700 > +++ new/modules/graphics/src/main/native-glass/win/GlassApplication.cpp 2016-03-30 23:40:04.000000000 -0700 > @@ -51,9 +51,6 @@ > HHOOK GlassApplication::sm_hMouseLLHook = NULL; > > jfloat GlassApplication::overrideUIScale = -1.0f; > -jfloat GlassApplication::overrideRenderScale = -1.0f; > -jfloat GlassApplication::minDPIScale = 1.0f; > -jboolean GlassApplication::forceIntegerRenderScale = JNI_TRUE; > > /* static */ > void GlassApplication::SetGlassClassLoader(JNIEnv *env, jobject classLoader) > @@ -370,13 +367,9 @@ > * Signature: ()V > */ > JNIEXPORT void JNICALL Java_com_sun_glass_ui_win_WinApplication_initIDs > - (JNIEnv *env, jclass cls, > - jfloat overrideUIScale, jfloat overrideRenderScale, jfloat minDPIScale, jboolean forceIntegerRenderScale) > + (JNIEnv *env, jclass cls, jfloat overrideUIScale) > { > GlassApplication::overrideUIScale = overrideUIScale; > - GlassApplication::overrideRenderScale = overrideRenderScale; > - GlassApplication::minDPIScale = minDPIScale; > - GlassApplication::forceIntegerRenderScale = forceIntegerRenderScale; > > javaIDs.Application.reportExceptionMID = > env->GetStaticMethodID(cls, "reportException", "(Ljava/lang/Throwable;)V"); > --- old/modules/graphics/src/main/native-glass/win/GlassApplication.h 2016-03-30 23:40:06.000000000 -0700 > +++ new/modules/graphics/src/main/native-glass/win/GlassApplication.h 2016-03-30 23:40:05.000000000 -0700 > @@ -105,22 +105,15 @@ > static ULONG GetAccessibilityCount(); > > static jfloat overrideUIScale; > - static jfloat overrideRenderScale; > - static jfloat minDPIScale; > - static jboolean forceIntegerRenderScale; > > - inline static jfloat GetUIScale(UINT dpi) > + inline static jboolean IsUIScaleOverridden() > { > - if (overrideUIScale > 0.0f) return overrideUIScale; > - jfloat uiScale = dpi / 96.0f; > - if (uiScale < minDPIScale) return 1.0f; > - return uiScale; > + return (overrideUIScale > 0.0f); > } > > - inline static jfloat getRenderScale(jfloat uiScale) { > - if (overrideRenderScale > 0.0f) return overrideRenderScale; > - if (forceIntegerRenderScale) return ceil(uiScale); > - return uiScale; > + inline static jfloat GetUIScale(UINT dpi) > + { > + return IsUIScaleOverridden() ? overrideUIScale : dpi / 96.0f; > } > > protected: > --- old/modules/graphics/src/main/native-glass/win/GlassScreen.cpp 2016-03-30 23:40:07.000000000 -0700 > +++ new/modules/graphics/src/main/native-glass/win/GlassScreen.cpp 2016-03-30 23:40:07.000000000 -0700 5184,5185c5423,5424 < + mis->uiScaleX = uiresx / 96.0f; < + mis->uiScaleY = uiresy / 96.0f; --- > + mis->uiScaleX = GlassApplication::GetUIScale(uiresx); > + mis->uiScaleY = GlassApplication::GetUIScale(uiresy); 5239c5478 < + if (scalex > 1.0f) { --- > + if (scalex != 1.0f) { 5245c5484 < + if (scaley > 1.0f) { --- > + if (scaley != 1.0f) { 5271,5273c5510,5519 < --- old/modules/graphics/src/main/native-glass/win/GlassWindow.cpp 2016-03-29 21:03:01.000000000 -0700 < +++ new/modules/graphics/src/main/native-glass/win/GlassWindow.cpp 2016-03-29 21:03:00.000000000 -0700 < @@ -650,34 +650,76 @@ --- > --- old/modules/graphics/src/main/native-glass/win/GlassWindow.cpp 2016-03-30 23:40:08.000000000 -0700 > +++ new/modules/graphics/src/main/native-glass/win/GlassWindow.cpp 2016-03-30 23:40:08.000000000 -0700 > @@ -647,37 +647,83 @@ > } > > void GlassWindow::HandleDPIEvent(WPARAM wParam, LPARAM lParam) { > + if (GlassApplication::IsUIScaleOverridden()) { > + return; > + } > + 5367c5613 < @@ -1096,7 +1138,7 @@ --- > @@ -1096,7 +1142,7 @@ 5376,5377c5622,5623 < --- old/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubStage.java 2016-03-29 21:03:02.000000000 -0700 < +++ new/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubStage.java 2016-03-29 21:03:02.000000000 -0700 --- > --- old/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubStage.java 2016-03-30 23:40:09.000000000 -0700 > +++ new/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubStage.java 2016-03-30 23:40:09.000000000 -0700 5468,5469c5714,5715 < --- old/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java 2016-03-29 21:03:03.000000000 -0700 < +++ new/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java 2016-03-29 21:03:03.000000000 -0700 --- > --- old/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java 2016-03-30 23:40:10.000000000 -0700 > +++ new/modules/graphics/src/test/java/test/com/sun/javafx/pgstub/StubToolkit.java 2016-03-30 23:40:10.000000000 -0700 5485,5487c5731,5755 < --- old/modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java 2016-03-29 21:03:04.000000000 -0700 < +++ new/modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java 2016-03-29 21:03:04.000000000 -0700 < @@ -712,7 +712,7 @@ --- > --- old/modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java 2016-03-30 23:40:11.000000000 -0700 > +++ new/modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java 2016-03-30 23:40:11.000000000 -0700 > @@ -208,11 +208,6 @@ > // Initialize FX runtime when the JFXPanel instance is constructed > private synchronized static void initFx() { > // Note that calling PlatformImpl.startup more than once is OK > - AccessController.doPrivileged((PrivilegedAction) () -> { > - System.setProperty("glass.win.uiScale", "100%"); > - System.setProperty("glass.win.renderScale", "100%"); > - return null; > - }); > PlatformImpl.startup(() -> { > // No need to do anything here > }); > @@ -683,6 +678,9 @@ > } > if (pixelsIm == null) { > createResizePixelBuffer(scaleFactor); > + if (pixelsIm == null) { > + return; > + } > } > DataBufferInt dataBuf = (DataBufferInt)pixelsIm.getRaster().getDataBuffer(); > int[] pixelsData = dataBuf.getData(); > @@ -712,7 +710,7 @@ 5496c5764 < @@ -906,7 +906,7 @@ --- > @@ -906,7 +904,7 @@ 5505,5506c5773,5774 < --- old/modules/swing/src/main/java/javafx/embed/swing/SwingNode.java 2016-03-29 21:03:05.000000000 -0700 < +++ new/modules/swing/src/main/java/javafx/embed/swing/SwingNode.java 2016-03-29 21:03:05.000000000 -0700 --- > --- old/modules/swing/src/main/java/javafx/embed/swing/SwingNode.java 2016-03-30 23:40:12.000000000 -0700 > +++ new/modules/swing/src/main/java/javafx/embed/swing/SwingNode.java 2016-03-30 23:40:12.000000000 -0700 5712,5713c5980,5981 < --- old/modules/swt/src/main/java/javafx/embed/swt/FXCanvas.java 2016-03-29 21:03:07.000000000 -0700 < +++ new/modules/swt/src/main/java/javafx/embed/swt/FXCanvas.java 2016-03-29 21:03:06.000000000 -0700 --- > --- old/modules/swt/src/main/java/javafx/embed/swt/FXCanvas.java 2016-03-30 23:40:13.000000000 -0700 > +++ new/modules/swt/src/main/java/javafx/embed/swt/FXCanvas.java 2016-03-30 23:40:13.000000000 -0700 5732,5733c6000,6001 < --- old/modules/web/src/main/java/com/sun/javafx/webkit/prism/PrismGraphicsManager.java 2016-03-29 21:03:08.000000000 -0700 < +++ new/modules/web/src/main/java/com/sun/javafx/webkit/prism/PrismGraphicsManager.java 2016-03-29 21:03:08.000000000 -0700 --- > --- old/modules/web/src/main/java/com/sun/javafx/webkit/prism/PrismGraphicsManager.java 2016-03-30 23:40:14.000000000 -0700 > +++ new/modules/web/src/main/java/com/sun/javafx/webkit/prism/PrismGraphicsManager.java 2016-03-30 23:40:14.000000000 -0700 5747,5838d6014 < --- old/apps/samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SubSceneResizer.java 2016-03-29 21:03:09.000000000 -0700 < +++ new/apps/samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SubSceneResizer.java 2016-03-29 21:03:09.000000000 -0700 < @@ -82,8 +82,8 @@ < subScene.setWidth(width); < subScene.setHeight(height); < } < - final int controlsWidth = (int)snapSize(controlsPanel.prefWidth(-1)); < - final int controlsHeight = (int)snapSize(controlsPanel.prefHeight(-1)); < + final double controlsWidth = snapSizeX(controlsPanel.prefWidth(-1)); < + final double controlsHeight = snapSizeY(controlsPanel.prefHeight(-1)); < controlsPanel.resizeRelocate(width-controlsWidth,0,controlsWidth,controlsHeight); < } < } < --- old/apps/samples/Ensemble8/src/app/java/ensemble/control/Popover.java 2016-03-29 21:03:10.000000000 -0700 < +++ new/apps/samples/Ensemble8/src/app/java/ensemble/control/Popover.java 2016-03-29 21:03:10.000000000 -0700 < @@ -33,7 +33,6 @@ < < import java.util.LinkedList; < < -import ensemble.EnsembleApp; < import javafx.animation.Animation; < import javafx.animation.FadeTransition; < import javafx.animation.Interpolator; < @@ -53,11 +52,9 @@ < import javafx.scene.Node; < import javafx.scene.Scene; < import javafx.scene.control.Button; < -import javafx.scene.image.Image; < import javafx.scene.input.MouseEvent; < import javafx.scene.layout.Pane; < import javafx.scene.layout.Region; < -import javafx.scene.paint.Color; < import javafx.scene.shape.Rectangle; < import javafx.scene.text.Text; < import javafx.util.Duration; < @@ -94,7 +91,7 @@ < // private final EventHandler popoverScrollHandler; < private final EventHandler popoverHideHandler; < private Runnable onHideCallback = null; < - private int maxPopupHeight = -1; < + private double maxPopupHeight = -1; < < private DoubleProperty popoverHeight = new SimpleDoubleProperty(400) { < @Override protected void invalidated() { < @@ -229,15 +226,15 @@ < maxPopupHeight = (int)getScene().getHeight()-100; < } < final Insets insets = getInsets(); < - final int width = (int)getWidth(); < - final int height = (int)getHeight(); < - final int top = (int)insets.getTop(); < - final int right = (int)insets.getRight(); < - final int bottom = (int)insets.getBottom(); < - final int left = (int)insets.getLeft(); < + final double width = getWidth(); < + final double height = getHeight(); < + final double top = insets.getTop(); < + final double right = insets.getRight(); < + final double bottom = insets.getBottom(); < + final double left = insets.getLeft(); < < - int pageWidth = width - left - right; < - int pageHeight = height - top - bottom; < + double pageWidth = width - left - right; < + double pageHeight = height - top - bottom; < < frameBorder.resize(width, height); < < @@ -245,18 +242,18 @@ < pagesClipRect.setWidth(pageWidth); < pagesClipRect.setHeight(pageHeight); < < - int pageX = 0; < + double pageX = 0; < for (Node page : pagesPane.getChildren()) { < page.resizeRelocate(pageX, 0, pageWidth, pageHeight); < pageX += pageWidth + PAGE_GAP; < } < < - int buttonHeight = (int)(leftButton.prefHeight(-1)); < + double buttonHeight = leftButton.prefHeight(-1); < if (buttonHeight < 30) buttonHeight = 30; < - final int buttonTop = (int)((top-buttonHeight)/2d); < - final int leftButtonWidth = (int)snapSize(leftButton.prefWidth(-1)); < + final double buttonTop = (top-buttonHeight) / 2.0; < + final double leftButtonWidth = snapSizeX(leftButton.prefWidth(-1)); < leftButton.resizeRelocate(left, buttonTop,leftButtonWidth,buttonHeight); < - final int rightButtonWidth = (int)snapSize(rightButton.prefWidth(-1)); < + final double rightButtonWidth = snapSizeX(rightButton.prefWidth(-1)); < rightButton.resizeRelocate(width-right-rightButtonWidth, buttonTop,rightButtonWidth,buttonHeight); < < final double leftButtonRight = leftButton.isVisible() ? (left + leftButtonWidth) : left;