Changeset 1457 in josm


Ignore:
Timestamp:
2009-02-28T23:50:50+01:00 (16 years ago)
Author:
stoecker
Message:

added alt-gr as second alt modifier

Location:
trunk/src/org/openstreetmap/josm/actions/mapmode
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

    r1418 r1457  
    55
    66import java.awt.event.ActionEvent;
     7import java.awt.event.InputEvent;
    78import java.awt.event.KeyEvent;
    89import java.awt.event.MouseEvent;
    … …  
    7273            return;
    7374        boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
    74         boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0;
     75        boolean alt = (e.getModifiers() & (ActionEvent.ALT_MASK|InputEvent.ALT_GRAPH_MASK)) != 0;
    7576
    7677        Command c;
    … …  
    99100        boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
    100101        boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
    101         boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0;
     102        boolean alt = (e.getModifiers() & (ActionEvent.ALT_MASK|InputEvent.ALT_GRAPH_MASK)) != 0;
    102103
    103104        OsmPrimitive sel = Main.map.mapView.getNearestNode(e.getPoint());

  • trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

    r1448 r1457  
    579579    private void updateKeyModifiers(InputEvent e) {
    580580        ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
    581         alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0;
     581        alt = (e.getModifiers() & (ActionEvent.ALT_MASK|InputEvent.ALT_GRAPH_MASK)) != 0;
    582582        shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
    583583    }
    … …  
    585585    private void updateKeyModifiers(MouseEvent e) {
    586586        ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
    587         alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0;
     587        alt = (e.getModifiers() & (ActionEvent.ALT_MASK|InputEvent.ALT_GRAPH_MASK)) != 0;
    588588        shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
    589589    }

  • trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java

    r1169 r1457  
    7777        mousePos = null;
    7878        dragging = false;
    79 
    80     /*
    81         boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
    82         boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0;
    83      */
    8479    }
    8580

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

    r1454 r1457  
    99import java.awt.Rectangle;
    1010import java.awt.event.ActionEvent;
     11import java.awt.event.InputEvent;
    1112import java.awt.event.KeyEvent;
    1213import java.awt.event.MouseEvent;
    … …  
    318319            return;
    319320        boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
    320         boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0;
     321        boolean alt = (e.getModifiers() & (ActionEvent.ALT_MASK|InputEvent.ALT_GRAPH_MASK)) != 0;
    321322        boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
    322323
Note: See TracChangeset for help on using the changeset viewer.