8284654: Modal behavior returns to wrong stage

Backport-of: 864792d
openjdk · Jun 28, 2022 · bb13db2 · bb13db2 · openjdk-notifier · Jun 28, 2022
1 parent 9156991
commit bb13db2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java
@@ -899,7 +899,8 @@ protected void setPlatformEnabled(boolean enabled) {
         }
         if (enabled) {
             // Check if window is really enabled - to handle nested case
-            if (platformWindow != null && platformWindow.isEnabled()) {
+            if (platformWindow != null && platformWindow.isEnabled()
+                    && modality == Modality.APPLICATION_MODAL) {
                 requestToFront();
             }
         } else {