Changeset 4754 in josm for trunk/src/org

Timestamp:

2011-12-30T23:10:09+01:00 (12 years ago)

Author:

jttt

Message:

Fix #7207 download/upload dialogs steal focus, probably others too

File:

• trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java

@@ -48 +48 @@
     private boolean cancelable;
 
+    private void setDialogVisible(boolean visible) {
+        if (dialog.isVisible() != visible) {
+            dialog.setVisible(visible);
+        }
+    }
+
     private ProgressMonitorDialog getDialog() {
 
@@ -60 +66 @@
         }
         if (dialog != null) {
-            dialog.setVisible(!isInBackground || backgroundMonitor == null);
+            setDialogVisible(!isInBackground || backgroundMonitor == null);
         }
 
@@ -66 +72 @@
             backgroundMonitor.setVisible(true);
             if (dialog != null) {
-                dialog.setVisible(false);
+                setDialogVisible(false);
             }
             return backgroundMonitor;
@@ -72 +78 @@
             backgroundMonitor.setVisible(false);
             if (dialog != null) {
-                dialog.setVisible(true);
+                setDialogVisible(true);
             }
             return dialog;
         } else if (dialog != null) {
-            dialog.setVisible(true);
+            setDialogVisible(true);
             return dialog;
         } else