Changeset 2876 in josm for trunk/src/org/openstreetmap/josm/gui/MainApplication.java

Timestamp:

2010-01-18T21:52:10+01:00 (14 years ago)

Author:

bastiK

Message:

fix #3745 - fullscreen geometry not restored (patch by bomm)

File:

• trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) (2 diffs)

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

@@ -190 +190 @@
         JFrame mainFrame = new JFrame(tr("Java OpenStreetMap Editor"));
         Main.parent = mainFrame;
+        Main.addListener();
         final Main main = new MainApplication(mainFrame);
         monitor.worked(1);
@@ -201 +202 @@
         mainFrame.setVisible(true);
 
-        if (((!args.containsKey("no-maximize") && !args.containsKey("geometry")
-                && Main.pref.get("gui.geometry").length() == 0) || args.containsKey("maximize"))
-                && Toolkit.getDefaultToolkit().isFrameStateSupported(JFrame.MAXIMIZED_BOTH)) {
-            mainFrame.setExtendedState(JFrame.MAXIMIZED_BOTH);
+        boolean maximized = Boolean.parseBoolean(Main.pref.get("gui.maximized"));
+        if ((!args.containsKey("no-maximize") && maximized) || args.containsKey("maximize")) {
+            if (Toolkit.getDefaultToolkit().isFrameStateSupported(JFrame.MAXIMIZED_BOTH)) {
+                // Main.debug("Main window maximized");
+                Main.windowState = JFrame.MAXIMIZED_BOTH;
+                mainFrame.setExtendedState(Main.windowState);
+            } else {
+                Main.debug("Main window: maximizing not supported");
+            }
+        } else {
+            // Main.debug("Main window not maximized");
         }