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

Timestamp:

2010-04-23T10:26:20+02:00 (14 years ago)

Author:

bastiK

Message:

fixed #4930 - Relation editor "creeps"

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/relation/RelationDialogManager.java (modified) (2 diffs)
• preferences/ToolbarPreferences.java (modified) (1 diff)

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

@@ -233 +233 @@
      * upper left corner is close to <code>p</code>.
      */
-    protected boolean hasEditorWithCloseUpperLeftCorner(Point p) {
+    protected boolean hasEditorWithCloseUpperLeftCorner(Point p, RelationEditor thisEditor) {
         for (RelationEditor editor: openDialogs.values()) {
+            if (editor == thisEditor)
+                continue;
             Point corner = editor.getLocation();
             if (p.x >= corner.x -5 && corner.x + 5 >= p.x
@@ -255 +257 @@
         if (!openDialogs.isEmpty()) {
             Point corner = editor.getLocation();
-            while(hasEditorWithCloseUpperLeftCorner(corner)) {
+            while(hasEditorWithCloseUpperLeftCorner(corner, editor)) {
                 // shift a little, so that the dialogs are not exactly on top of each other
                 corner.x += 20;

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

@@ -685 +685 @@
 
     private static Collection<String> getToolString() {
-        return Main.pref.getCollection("toolbar", Arrays.asList(deftoolbar));
+        Collection<String> toolStr = Main.pref.getCollection("toolbar", Arrays.asList(deftoolbar));
+        if (toolStr == null || toolStr.size() == 0) {
+            toolStr = Arrays.asList(deftoolbar);
+        }
+        return toolStr;
     }