Changeset 4248 in josm for trunk/src/org

Timestamp:

2011-07-15T19:07:53+02:00 (13 years ago)

Author:

xeen

Message:

fix #6556

When the prefs are opened for the very first time, the window is now at most
as large as the parent window. After that, the dimensions are stored in JOSM's
preferences, so it won't work for existing installations.

As an additional measure, the dialog cannot be larger than the screen dimension
and as far as my testing goes this setting overwrites the stored dimension.
Unfortunately there is no way to determine the space occupied by application
launchers/taskbars across all systems and the pref dialog may be hidden behind
them.

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -9 +9 @@
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.Insets;
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -61 +63 @@
         super(JOptionPane.getFrameForComponent(parent), tr("Preferences"), ModalityType.DOCUMENT_MODAL);
         build();
+        this.setMinimumSize(new Dimension(600, 350));
+        // set the maximum width to the current screen. If the dialog is opened on a
+        // smaller screen than before, this will reset the stored preference.
+        this.setMaximumSize( Toolkit.getDefaultToolkit().getScreenSize());
     }
 
@@ -74 +80 @@
     public void setVisible(boolean visible) {
         if (visible) {
+            // Make the pref window at most as large as the parent JOSM window
+            // Have to take window decorations into account or the windows will
+            // be too large
+            Insets i = this.getParent().getInsets();
+            Dimension p = this.getParent().getSize();
+            p = new Dimension(Math.min(p.width-i.left-i.right, 700),
+                    Math.min(p.height-i.top-i.bottom, 800));
             new WindowGeometry(
                     getClass().getName() + ".geometry",
                     WindowGeometry.centerInWindow(
                             getParent(),
-                            new Dimension(700,800)
+                            p
                     )
             ).applySafe(this);