8284654: Modal behavior returns to wrong stage

Reviewed-by: arapte, kcr
openjdk · Jun 1, 2022 · 864792d · 864792d · openjdk-notifier · Jun 1, 2022
1 parent 83a46e0
commit 864792d
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
@@ -867,7 +867,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 {