Changeset 3198 in josm for trunk/src


Ignore:
Timestamp:
2010-04-22T23:22:47+02:00 (10 years ago)
Author:
bastiK
Message:

see #4929 - rectangle selection selects filtered objects.
(the other things mentioned in this ticket are not addressed)

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/SelectionManager.java

    r3177 r3198  
    190190
    191191        boolean shift = (e.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) != 0;
    192         boolean alt = (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0;
     192        boolean alt = (e.getModifiersEx() & (MouseEvent.ALT_DOWN_MASK | MouseEvent.ALT_GRAPH_DOWN_MASK)) != 0;
    193193        boolean ctrl = (e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) != 0;
    194194        if ((e.getModifiersEx() & MouseEvent.BUTTON3_DOWN_MASK) == 0) {
     
    284284            // nodes
    285285            for (Node n : nc.getCurrentDataSet().getNodes()) {
    286                 if (n.isUsable() && r.contains(nc.getPoint(n))) {
     286                if (n.isSelectable() && r.contains(nc.getPoint(n))) {
    287287                    selection.add(n);
    288288                }
     
    291291            // ways
    292292            for (Way w : nc.getCurrentDataSet().getWays()) {
    293                 if (!w.isUsable() || w.getNodesCount() == 0) {
     293                if (!w.isSelectable() || w.getNodesCount() == 0) {
    294294                    continue;
    295295                }
  • trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java

    r3179 r3198  
    8282                reconstruct(Action.INVISIBLE_TO_DEFAULT, dlg);
    8383            }
    84             dlg.showNotify();
    8584        } else {
    8685            dlg.hideDialog();
  • trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

    r3189 r3198  
    191191
    192192    public void processDatasetEvent(AbstractDatasetChangedEvent event) {
    193         System.err.print("FilterDialog/processDatasetEvent");
    194193        filters.executeFilters();
    195194    }
Note: See TracChangeset for help on using the changeset viewer.