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

Timestamp:

2011-09-28T23:13:06+02:00 (13 years ago)

Author:

Don-vip

Message:

fix #6794 - download dialog slippymap: mouseup on licence text instead of click

File:

• trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java

@@ -56 +56 @@
     private SizeButton iSizeButton = null;
     private SourceButton iSourceButton = null;
+    
+    private boolean isSelecting;
 
     /**
@@ -77 +79 @@
         iSizeButton = sizeButton;
         iSourceButton = sourceButton;
+        
+        isSelecting = false;
 
         InputMap inputMap = navComp.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
@@ -132 +136 @@
                 iEndSelectionPoint = e.getPoint();
                 iSlippyMapChooser.setSelection(iStartSelectionPoint, iEndSelectionPoint);
+                isSelecting = true;
             }
         }
@@ -144 +149 @@
         if (e.getButton() == MouseEvent.BUTTON1) {
 
-            int sourceButton = iSourceButton.hit(e.getPoint());
-
-            if (iSizeButton.hit(e.getPoint())) {
-                iSizeButton.toggle();
-                iSlippyMapChooser.resizeSlippyMap();
-            } else if (iSlippyMapChooser.handleAttribution(e.getPoint(), true)) {
-                /* do nothing, handleAttribution() already did the work */
-            } else if (sourceButton == SourceButton.HIDE_OR_SHOW) {
-                iSourceButton.toggle();
-                iSlippyMapChooser.repaint();
-            } else if (sourceButton != 0) {
-                iSlippyMapChooser.toggleMapSource(iSourceButton.hitToTileSource(sourceButton));
-            } else {
-                if (e.getClickCount() == 1) {
-                    iSlippyMapChooser.setSelection(iStartSelectionPoint, e.getPoint());
-
-                    // reset the selections start and end
-                    iEndSelectionPoint = null;
-                    iStartSelectionPoint = null;
-                }
-            }
-
+                if (isSelecting && e.getClickCount() == 1) {
+                iSlippyMapChooser.setSelection(iStartSelectionPoint, e.getPoint());
+
+                // reset the selections start and end
+                iEndSelectionPoint = null;
+                iStartSelectionPoint = null;
+                isSelecting = false;
+                
+                } else {
+                int sourceButton = iSourceButton.hit(e.getPoint());
+
+                if (iSizeButton.hit(e.getPoint())) {
+                    iSizeButton.toggle();
+                    iSlippyMapChooser.resizeSlippyMap();
+                } else if (iSlippyMapChooser.handleAttribution(e.getPoint(), true)) {
+                    /* do nothing, handleAttribution() already did the work */
+                } else if (sourceButton == SourceButton.HIDE_OR_SHOW) {
+                    iSourceButton.toggle();
+                    iSlippyMapChooser.repaint();
+                } else if (sourceButton != 0) {
+                    iSlippyMapChooser.toggleMapSource(iSourceButton.hitToTileSource(sourceButton));
+                }
+                }
         }
     }