Changeset 2229 in josm for trunk/src/org

Timestamp:

2009-10-03T13:47:51+02:00 (15 years ago)

Author:

xeen

Message:

Fix #3634 Selecting with middle mouse button

File:

• trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified) (3 diffs)

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

@@ -212 +212 @@
                         // of the first middle click)
                         if(isAtOldPosition && middleMouseDown) {
-                            popupCycleSelection(osms);
+                            // Hand down mouse modifiers so the SHIFT mod can be
+                            // handled correctly (see funcion)
+                            popupCycleSelection(osms, ms.modifiers);
                         }
 
@@ -295 +297 @@
          * will automatically select the next item and update the map
          * @param osms
-         */
-        private final void popupCycleSelection(Collection<OsmPrimitive> osms) {
+         * @param mouse modifiers
+         */
+        private final void popupCycleSelection(Collection<OsmPrimitive> osms, int mods) {
             // Find some items that are required for cycling through
             OsmPrimitive firstItem = null;
@@ -310 +313 @@
                 if(firstSelected == null && osm.isSelected()) {
                     firstSelected = osm;
+                }
+            }
+
+            // Clear previous selection if SHIFT (add to selection) is not
+            // pressed. Cannot use "setSelected()" because it will cause a
+            // fireSelectionChanged event which is unnecessary at this point.
+            if((mods & MouseEvent.SHIFT_DOWN_MASK) == 0) {
+                for(OsmPrimitive o : Main.main.getCurrentDataSet().getSelected()) {
+                    o.setSelected(false);
                 }
             }