Changeset 6993 in josm for trunk/src


Ignore:
Timestamp:
2014-04-22T09:40:38+02:00 (6 years ago)
Author:
bastiK
Message:

see #9397 - Move map no longer works on OSX (fix selection rectagle on map move)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r6992 r6993  
    6565 * If no object is under the mouse, move all selected objects (if any)
    6666 *
    67  * @author imi
     67 * On Mac OS, Ctrl + mouse button 1 simulates right click (map move), so the
     68 * feature "selection remove" is disabled on this platform.
    6869 */
    6970public class SelectAction extends MapMode implements AWTEventListener, SelectionEnded {
     
    337338                c = "lasso";
    338339            } else {
    339                 c = "rect" + (shift ? "_add" : (ctrl ? "_rm" : ""));
     340                c = "rect" + (shift ? "_add" : (ctrl && !Main.isPlatformOsx() ? "_rm" : ""));
    340341            }
    341342            break;
     
    457458        case select:
    458459        default:
    459             // start working with rectangle or lasso
    460             selectionManager.register(mv, lassoMode);
    461             selectionManager.mousePressed(e);
    462             break;
     460            if (!(ctrl && Main.isPlatformOsx())) {
     461                // start working with rectangle or lasso
     462                selectionManager.register(mv, lassoMode);
     463                selectionManager.mousePressed(e);
     464                break;
     465            }
    463466        }
    464467        if (giveUserFeedback(e)) {
Note: See TracChangeset for help on using the changeset viewer.