Ticket #2083: josm-save-geometry-fix.patch

src/org/openstreetmap/josm/Main.java

@@ -414 +414 @@
         // save the current window geometry
         String curGeometryPref = pref.get("gui.geometry");
         if(curGeometryPref.length() != 0) {
+            Dimension screenDimension = Toolkit.getDefaultToolkit().getScreenSize();
             Rectangle bounds = parent.getBounds();
-            pref.put("gui.geometry",
-                     (int)bounds.getWidth() +
-                     "x" + (int)bounds.getHeight() +
-                     "+" + (int)bounds.getX() +
-                     "+" + (int)bounds.getY());
+            int width = (int)bounds.getWidth();
+            int height = (int)bounds.getHeight();
+            int x = (int)bounds.getX();
+            int y = (int)bounds.getY();
+            if(width > screenDimension.width)
+                width = screenDimension.width;
+            if(height > screenDimension.height)
+                width = screenDimension.height;
+            if(x < 0)
+                x = 0;
+            if(y < 0)
+                y = 0;
+            pref.put("gui.geometry", width + "x" + height + "+" + x + "+" + y);
         }
     }
 }

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

@@ -177 +177 @@
         mainFrame.setVisible(true);
         splash.closeSplash();
 
-        if (!args.containsKey("no-fullscreen") && !args.containsKey("geometry") && Main.pref.get("gui.geometry") == null && Toolkit.getDefaultToolkit().isFrameStateSupported(JFrame.MAXIMIZED_BOTH))
+        if (!args.containsKey("no-fullscreen") && !args.containsKey("geometry") && Main.pref.get("gui.geometry").length() == 0 && Toolkit.getDefaultToolkit().isFrameStateSupported(JFrame.MAXIMIZED_BOTH))
             mainFrame.setExtendedState(JFrame.MAXIMIZED_BOTH);
 
         EventQueue.invokeLater(new Runnable(){