Changeset 3919 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2011-02-20T15:08:35+01:00 (13 years ago)

Author:

stoecker

Message:

unify cursor handling, hopefully fix #5381

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapMover.java (modified) (3 diffs)
• NavigatableComponent.java (modified) (2 diffs)

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

@@ -67 +67 @@
      */
     private final NavigatableComponent nc;
-    /**
-     * The old cursor when we changed it to movement cursor.
-     */
-    private Cursor oldCursor;
 
     private boolean movementInPlace = false;
@@ -167 +163 @@
         movementInPlace = true;
         mousePosMove = nc.getEastNorth(e.getX(), e.getY());
-        oldCursor = nc.getCursor();
-        nc.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+        nc.setNewCursor(Cursor.MOVE_CURSOR, this);
     }
 
@@ -178 +173 @@
             return;
         movementInPlace = false;
-        if (oldCursor != null)
-            nc.setCursor(oldCursor);
-        else
-            nc.setCursor(Cursor.getDefaultCursor());
+        nc.resetCursor(this);
         mousePosMove = null;
-        oldCursor = null;
     }
 

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.marktr;
 
+import java.awt.Cursor;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -1213 +1214 @@
         SYSTEMS_OF_MEASUREMENT.put(marktr("Imperial"), IMPERIAL_SOM);
     }
+
+    private class CursorInfo {
+        public Cursor cursor;
+        public Object object;
+        public CursorInfo(Cursor c, Object o) {
+            cursor = c;
+            object = o;
+        }
+    }
+
+    private LinkedList<CursorInfo> Cursors = new LinkedList<CursorInfo>();
+    /**
+     * Set new cursor.
+     */
+    public void setNewCursor(Cursor cursor, Object reference) {
+        if(Cursors.size() > 0) {
+            CursorInfo l = Cursors.getLast();
+            if(l != null && l.cursor == cursor && l.object == reference) {
+                return;
+            }
+            stripCursors(reference);
+        }
+        Cursors.add(new CursorInfo(cursor, reference));
+        setCursor(cursor);
+    }
+    public void setNewCursor(int cursor, Object reference) {
+        setNewCursor(Cursor.getPredefinedCursor(cursor), reference);
+    }
+    /**
+     * Remove the new cursor and reset to previous
+     */
+    public void resetCursor(Object reference) {
+        if(Cursors.size() == 0) {
+            setCursor(null);
+            return;
+        }
+        CursorInfo l = Cursors.getLast();
+        stripCursors(reference);
+        if(l != null && l.object == reference) {
+            if(Cursors.size() == 0)
+                setCursor(null);
+            else
+                setCursor(Cursors.getLast().cursor);
+        }
+    }
+
+    private void stripCursors(Object reference) {
+        LinkedList<CursorInfo> c = new LinkedList<CursorInfo>();
+        for(CursorInfo i : Cursors) {
+            if(i.object != reference)
+                c.add(i);
+        }
+        Cursors = c;
+    }
 }