Changeset 845 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

Timestamp:

2008-08-22T21:25:28+02:00 (18 years ago)

Author:

stoecker

Message:

Prevent editing inactive layer. Fix layer oder and display order. Closes #371

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) (5 diffs)

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

@@ -124 +124 @@
          */
         public void eventDispatched(AWTEvent event) {
+                if(!Main.map.mapView.isDrawableLayer())
+                        return;
                 InputEvent e = (InputEvent) event;
                 ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
@@ -134 +136 @@
          */
         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+                if(!Main.map.mapView.isDrawableLayer())
+                        return;
                 computeHelperLine();
         }
@@ -146 +150 @@
 
                 if (e.getButton() != MouseEvent.BUTTON1)
+                        return;
+                if(!Main.map.mapView.isDrawableLayer())
                         return;
 
@@ -331 +337 @@
         
         @Override public void mouseMoved(MouseEvent e) {
+                if(!Main.map.mapView.isDrawableLayer())
+                        return;
 
                 // we copy ctrl/alt/shift from the event just in case our global
@@ -441 +449 @@
          */
         @Override public void mouseExited(MouseEvent e) {
+                if(!Main.map.mapView.isDrawableLayer())
+                        return;
                 mousePos = e.getPoint();
                 Main.map.mapView.repaint();