Multiple selection check for non-interactive objects

diff --git a/net/systemeD/potlatch2/controller/SelectedMultiple.as b/net/systemeD/potlatch2/controller/SelectedMultiple.as
index 939ddb8124e1e2f712fb56548bea05470a4e63ee..4ccc48be5ae717756a8c62b45721e4a01b283fc4 100644 (file)
--- a/net/systemeD/potlatch2/controller/SelectedMultiple.as
+++ b/net/systemeD/potlatch2/controller/SelectedMultiple.as
@@ -1,5 +1,6 @@
 package net.systemeD.potlatch2.controller {
        import flash.events.*;
+       import flash.display.DisplayObject;
        
        import net.systemeD.halcyon.AttentionEvent;
        import net.systemeD.halcyon.connection.*;
@@ -16,9 +17,10 @@ package net.systemeD.potlatch2.controller {
 
                override public function processMouseEvent(event:MouseEvent, entity:Entity):ControllerState {
                        if (event.type==MouseEvent.MOUSE_MOVE || event.type==MouseEvent.ROLL_OVER || event.type==MouseEvent.MOUSE_OUT) { return this; }
+                       var paint:MapPaint = getMapPaint(DisplayObject(event.target));
                        var focus:Entity = getTopLevelFocusEntity(entity);
 
-                       if ( event.type == MouseEvent.MOUSE_DOWN && entity && event.ctrlKey && !event.altKey ) {
+                       if ( event.type == MouseEvent.MOUSE_DOWN && entity && event.ctrlKey && !event.altKey && paint.interactive ) {
                                // modify selection
                                layer.setHighlight(entity, { selected: toggleSelection(entity) });
                                controller.updateSelectionUI();

diff --git a/net/systemeD/potlatch2/controller/SelectedWay.as b/net/systemeD/potlatch2/controller/SelectedWay.as
index a40070ef7b02654b25f68979c82560b43bb3539a..598de04a0de65987543b9cd3e3de7950ae2c54eb 100644 (file)
--- a/net/systemeD/potlatch2/controller/SelectedWay.as
+++ b/net/systemeD/potlatch2/controller/SelectedWay.as
@@ -71,7 +71,7 @@ package net.systemeD.potlatch2.controller {
                                Way(firstSelected).insertNodeAtClosestPosition(node, false, undo.push);
                                MainUndoStack.getGlobalStack().addAction(undo);
                                return this;
-                       } else if ( event.type == MouseEvent.MOUSE_DOWN && event.ctrlKey && !event.altKey && entity && entity!=firstSelected) {
+                       } else if ( event.type == MouseEvent.MOUSE_DOWN && event.ctrlKey && !event.altKey && entity && entity!=firstSelected && paint.interactive) {
                                // multiple selection
                                return new SelectedMultiple([firstSelected,entity],layer);
                        } else if ( event.type == MouseEvent.MOUSE_UP && focus==firstSelected ) {