boog fix

diff --git a/net/systemeD/potlatch2/controller/DrawWay.as b/net/systemeD/potlatch2/controller/DrawWay.as
index 59c71e09be9719346dab338a0f726b40a5e54a16..733b24a73c2613a9573e6c0bbe4037d2528efb12 100644 (file)
--- a/net/systemeD/potlatch2/controller/DrawWay.as
+++ b/net/systemeD/potlatch2/controller/DrawWay.as
@@ -13,6 +13,9 @@ package net.systemeD.potlatch2.controller {
                private var leaveNodeSelected:Boolean;
                private var lastClick:Entity=null;
                private var lastClickTime:Date;
                private var leaveNodeSelected:Boolean;
                private var lastClick:Entity=null;
                private var lastClickTime:Date;

+               private var hoverEntity:Entity;                 // keep track of the currently rolled-over object, because
+                                                                                               // Flash can fire a mouseDown from the map even if you
+                                                                                               // haven't rolled out of the way

                
                public function DrawWay(way:Way, editEnd:Boolean, leaveNodeSelected:Boolean) {
                        super(way);
                
                public function DrawWay(way:Way, editEnd:Boolean, leaveNodeSelected:Boolean) {
                        super(way);


@@ -28,6 +31,7 @@ package net.systemeD.potlatch2.controller {
                override public function processMouseEvent(event:MouseEvent, entity:Entity):ControllerState {
                        var mouse:Point;
                        var node:Node;
                override public function processMouseEvent(event:MouseEvent, entity:Entity):ControllerState {
                        var mouse:Point;
                        var node:Node;

+                       if (entity == null && hoverEntity) { entity=hoverEntity; }

                        var focus:Entity = getTopLevelFocusEntity(entity);
 
                        if ( event.type == MouseEvent.MOUSE_UP ) {
                        var focus:Entity = getTopLevelFocusEntity(entity);
 
                        if ( event.type == MouseEvent.MOUSE_UP ) {


@@ -73,8 +77,10 @@ package net.systemeD.potlatch2.controller {
                                                  controller.map.coord2latp(event.localY));
                                elastic.end = mouse;
                        } else if ( event.type == MouseEvent.ROLL_OVER && focus!=selectedWay) {
                                                  controller.map.coord2latp(event.localY));
                                elastic.end = mouse;
                        } else if ( event.type == MouseEvent.ROLL_OVER && focus!=selectedWay) {

+                               hoverEntity=focus;

                                controller.map.setHighlight(focus, { showNodesHover: true });
                        } else if ( event.type == MouseEvent.MOUSE_OUT  && focus!=selectedWay) {
                                controller.map.setHighlight(focus, { showNodesHover: true });
                        } else if ( event.type == MouseEvent.MOUSE_OUT  && focus!=selectedWay) {

+                               hoverEntity=null;

                                controller.map.setHighlight(focus, { showNodesHover: false });
                                controller.map.setHighlight(selectedWay, { showNodes: true });
                                // ** this call to setHighlight(selectedWay) is necessary in case the hovered way (blue nodes)
                                controller.map.setHighlight(focus, { showNodesHover: false });
                                controller.map.setHighlight(selectedWay, { showNodes: true });
                                // ** this call to setHighlight(selectedWay) is necessary in case the hovered way (blue nodes)