- Timestamp:
- 2023-06-22T22:13:03+02:00 (14 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
r18665 r18767 24 24 25 25 import javax.swing.JOptionPane; 26 import javax.swing.SwingUtilities; 26 27 27 28 import org.openstreetmap.josm.actions.MergeNodesAction; … … 480 481 @Override 481 482 public void mouseMoved(MouseEvent e) { 482 // Mac OSX simulates with ctrl + mouse 1 the second mouse button hence no dragging events get fired.483 if (PlatformManager.isPlatformOsx() && (mode == Mode.ROTATE || mode == Mode.SCALE)) {484 mouseDragged(e);485 return;486 }487 483 oldEvent = e; 488 484 if (giveUserFeedback(e)) { … … 571 567 virtualManager.createMiddleNodeFromVirtual(currentEN); 572 568 } else { 573 if (!updateCommandWhileDragging( currentEN)) return;569 if (!updateCommandWhileDragging(e, currentEN)) return; 574 570 } 575 571 … … 713 709 * Create or update data modification command while dragging mouse - implementation of 714 710 * continuous moving, scaling and rotation 711 * @param mouseEvent The triggering mouse event 715 712 * @param currentEN - mouse position 716 713 * @return status of action (<code>true</code> when action was performed) 717 714 */ 718 private boolean updateCommandWhileDragging( EastNorth currentEN) {715 private boolean updateCommandWhileDragging(MouseEvent mouseEvent, EastNorth currentEN) { 719 716 // Currently we support only transformations which do not affect relations. 720 717 // So don't add them in the first place to make handling easier … … 789 786 startEN = currentEN; // drag can continue after scaling/rotation 790 787 791 if (mode != Mode.ROTATE && mode != Mode.SCALE ) {788 if (mode != Mode.ROTATE && mode != Mode.SCALE || SwingUtilities.isRightMouseButton(mouseEvent)) { 792 789 return false; 793 790 }
Note:
See TracChangeset
for help on using the changeset viewer.