Changeset 3182 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-04-14T17:17:36+02:00 (15 years ago)

Author:

bastiK

Message:

fix position of relation editor

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• GenericRelationEditor.java (modified) (1 diff)
• RelationDialogManager.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -548 +548 @@
         }
         super.setVisible(visible);
-        if (!visible) {
+        if (visible) {
+            RelationDialogManager.getRelationDialogManager().positionOnScreen(this);
+        } else {
             // make sure all registered listeners are unregistered
             //

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java

@@ -226 +226 @@
 
     /**
-     * Positions an {@see RelationEditor} centered on the screen
-     *
-     * @param editor the editor
-     */
-    protected void centerOnScreen(RelationEditor editor) {
-        Point p = new Point(0,0);
-        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
-        p.x = (d.width - editor.getSize().width)/2;
-        p.y = (d.height - editor.getSize().height)/2;
-        p.x = Math.max(p.x,0);
-        p.y = Math.max(p.y,0);
-        editor.setLocation(p);
-    }
-
-    /**
      * Replies true, if there is another open {@see RelationEditor} whose
      * upper left corner is close to <code>p</code>.
@@ -259 +244 @@
 
     /**
-     * Positions a {@see RelationEditor} close to the center of the screen, in such
-     * a way, that it doesn't entirely cover another {@see RelationEditor}
-     *
-     * @param editor
-     */
-    protected void positionCloseToScreenCenter(RelationEditor editor) {
-        Point p = new Point(0,0);
-        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
-        p.x = (d.width - editor.getSize().width)/2;
-        p.y = (d.height - editor.getSize().height)/2;
-        p.x = Math.max(p.x,0);
-        p.y = Math.max(p.y,0);
-        while(hasEditorWithCloseUpperLeftCorner(p)) {
-            p.x += 20;
-            p.y += 20;
-        }
-        editor.setLocation(p);
-    }
-
-    /**
      * Positions a {@see RelationEditor} on the screen. Tries to center it on the
      * screen. If it hide another instance of an editor at the same position this
@@ -288 +253 @@
     public void positionOnScreen(RelationEditor editor) {
         if (editor == null) return;
-        if (openDialogs.isEmpty()) {
-            centerOnScreen(editor);
-        } else {
-            positionCloseToScreenCenter(editor);
+        if (!openDialogs.isEmpty()) {
+            Point corner = editor.getLocation();
+            while(hasEditorWithCloseUpperLeftCorner(corner)) {
+                // shift a little, so that the dialogs are not exactly on top of each other
+                corner.x += 20;
+                corner.y += 20;
+            }
+            editor.setLocation(corner);
         }
     }