Changeset 4617 in josm for trunk/src/org

Timestamp:

2011-11-29T00:55:26+01:00 (13 years ago)

Author:

Don-vip

Message:

fix #7078 - Closing element history dialog moves objects

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -125 +125 @@
     private long mouseDownTime = 0;
     /**
+     * The pressed button of the user mouse down event.
+     */
+    private int mouseDownButton = 0;
+    /**
+     * The time of the user mouse down event.
+     */
+    private long mouseReleaseTime = 0;
+    /**
      * The time which needs to pass between click and release before something
      * counts as a move, in milliseconds
@@ -336 +344 @@
         if (!mv.isActiveLayerVisible())
             return;
+        
+        // Swing sends random mouseDragged events when closing dialogs by double-clicking their top-left icon on Windows
+        // Ignore such false events to prevent issues like #7078
+        if (mouseDownButton == MouseEvent.BUTTON1 && mouseReleaseTime > mouseDownTime) {
+            return;
+        }
 
         cancelDrawMode = true;
@@ -648 +662 @@
     public void mousePressed(MouseEvent e) {
         // return early
-        if (!mv.isActiveLayerVisible() || !(Boolean) this.getValue("active") || e.getButton() != MouseEvent.BUTTON1)
+        if (!mv.isActiveLayerVisible() || !(Boolean) this.getValue("active") || (mouseDownButton = e.getButton()) != MouseEvent.BUTTON1)
             return;
 
@@ -705 +719 @@
 
         startingDraggingPos = null;
+        mouseReleaseTime = System.currentTimeMillis();
 
         if (mode == Mode.select) {