8231865: JFXPanel sends resize event with size 0x0 on HiDPI devices

Reviewed-by: angorya
hsiafan · Jul 10, 2023 · 8fef6a3 · 8fef6a3
1 parent 8635f81
commit 8fef6a3
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/modules/javafx.swing/src/main/java/javafx/embed/swing/JFXPanel.java b/modules/javafx.swing/src/main/java/javafx/embed/swing/JFXPanel.java
@@ -608,15 +608,15 @@ protected void processComponentEvent(ComponentEvent e) {
     private void updateComponentSize() {
         int oldWidth = pWidth;
         int oldHeight = pHeight;
-        // It's quite possible to get negative values here, this is not
-        // what JavaFX embedded scenes/stages are ready to
-        pWidth = Math.max(0, getWidth());
-        pHeight = Math.max(0, getHeight());
         if (getBorder() != null) {
             Insets i = getBorder().getBorderInsets(this);
             pWidth -= (i.left + i.right);
             pHeight -= (i.top + i.bottom);
         }
+        // It's quite possible to get negative values here, this is not
+        // what JavaFX embedded scenes/stages are ready to
+        pWidth = Math.max(0, getWidth());
+        pHeight = Math.max(0, getHeight());
         double newScaleFactorX = scaleFactorX;
         double newScaleFactorY = scaleFactorY;
         Graphics g = getGraphics();
@@ -626,6 +626,9 @@ private void updateComponentSize() {
         newScaleFactorY = GraphicsEnvironment.getLocalGraphicsEnvironment().
                           getDefaultScreenDevice().getDefaultConfiguration().
                           getDefaultTransform().getScaleY();
+        if (oldWidth == 0 && oldHeight == 0 && pWidth == 0 && pHeight == 0) {
+            return;
+        }
         if (oldWidth != pWidth || oldHeight != pHeight ||
             newScaleFactorX != scaleFactorX || newScaleFactorY != scaleFactorY)
         {