Changeset 1093 in josm for trunk/src

Timestamp:

2008-11-27T00:22:33+01:00 (15 years ago)

Author:

framm

Message:

• hide splash screen if other dialog is shown. patch by Jiri Klement <jiri.klement@…>

File:

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

trunk/src/org/openstreetmap/josm/gui/SplashScreen.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.AWTEvent;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -11 +12 @@
 import java.awt.Insets;
 import java.awt.Toolkit;
+import java.awt.event.AWTEventListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -120 +122 @@
                         }
                 });
+                
+        // Hide splashscreen when other window is created
+                Toolkit.getDefaultToolkit().addAWTEventListener(awtListener, AWTEvent.WINDOW_EVENT_MASK);
+                
                 setVisible(true);
         }
+        
+        private AWTEventListener awtListener = new AWTEventListener() {
+                public void eventDispatched(AWTEvent event) {
+                        if (event.getSource() != SplashScreen.this) {
+                                closeSplash();
+                        }
+                }               
+        };
 
         /**
@@ -142 +156 @@
                 if (!visible)
                         return;
+                Toolkit.getDefaultToolkit().removeAWTEventListener(awtListener);
                 try {
-                        SwingUtilities.invokeAndWait(closerRunner);
+                        SwingUtilities.invokeLater(closerRunner);
                 } catch (Exception e) {
                         e.printStackTrace();