Changeset 3543 in josm for trunk/src/org

Timestamp:

2010-09-18T22:40:19+02:00 (14 years ago)

Author:

bastiK

Message:

fixed #5470 - fullscreen moves dialogs below main window

File:

• trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java

@@ -8 +8 @@
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
+import java.awt.Rectangle;
 import java.awt.Toolkit;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -27 +29 @@
     private boolean selected;
     private GraphicsDevice gd;
+    private Rectangle prevBounds;
+
     public FullscreenToggleAction() {
         super(
@@ -73 +77 @@
         notifySelectedState();
 
-        Frame frame = (Frame)Main.parent;
+        Frame frame = (Frame) Main.parent;
+
+        List<Window> visibleWindows = new ArrayList<Window>();
+        visibleWindows.add(frame);
+        for (Window w : Frame.getWindows()) {
+            if (w.isVisible() && w != frame) {
+                visibleWindows.add(w);
+            }
+        }
         
         // we cannot use hw-exclusive fullscreen mode in MS-Win, as long
@@ -83 +95 @@
         // screen by default (it's a simulated mode, but should be ok)
         String exclusive = Main.pref.get("draw.fullscreen.exclusive-mode", "auto");
-        if ("yes".equals(exclusive) || ("auto".equals(exclusive) && !(Main.platform instanceof PlatformHookWindows))) {
+        if ("true".equals(exclusive) || ("auto".equals(exclusive) && !(Main.platform instanceof PlatformHookWindows))) {
             frame.dispose();
             frame.setUndecorated(selected);
             gd.setFullScreenWindow(selected ? frame : null);
-            frame.setVisible(true);
+            for (Window wind : visibleWindows) {
+                wind.setVisible(true);
+            }
         } else {
             frame.dispose();
-            if (Main.pref.getBoolean("draw.fullscreen.set-screen-bounds", true)) {
+            if (Main.pref.getBoolean("draw.fullscreen.set-screen-bounds", true) && selected) {
+                prevBounds = frame.getBounds();
                 Dimension dim = Toolkit.getDefaultToolkit().getScreenSize();
                 frame.setBounds(0, 0, dim.width, dim.height);
+            } else if (prevBounds != null) {
+                frame.setBounds(prevBounds);
             }
             frame.setUndecorated(selected);
-            frame.setVisible(true);
+            for (Window wind : visibleWindows) {
+                wind.setVisible(true);
+            }
         }
     }