Changeset 1919 in josm

Timestamp:

Aug 7, 2009 7:27:53 PM (4 years ago)

Author:

Gubaer

Message:

fixed #3203: pressing DEL deletes Layer instead of objects

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -131 +131 @@
         //-- delete layer action
         DeleteLayerAction deleteLayerAction = new DeleteLayerAction();
-        layerList.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
-                KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0),"deleteLayer"
-        );
-        layerList.getActionMap().put("deleteLayer", deleteLayerAction);
+        // #3203: grabs DELETE even for primitives on the map
+        // FIXME: disabling for now, don't understand yet what's going on
+        //        layerList.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
+        //                KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0),"deleteLayer"
+        //        );
+        //        layerList.getActionMap().put("deleteLayer", deleteLayerAction);
         adaptTo(deleteLayerAction, selectionModel);
         buttonPanel.add(new SideButton(deleteLayerAction, "delete"));