fix tab selection issue, and remove annoying flash of drag-and-drop panel when going...

diff --git a/TODO.txt b/TODO.txt
index ced24e331497fe6c6da07e108a453dec9a8ee609..43c156724344ab5613b06e656423d8caa0416673 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -28,7 +28,6 @@ Potlatch 2: main outstanding issues
 
 == Tag editing ==
 
-** Doesn't always update selected tab when you select a new entity
 * Dynamic reloading of stylesheet/map_features, so that you don't need to reload the full page when editing them
 * If a select name is too long then, the select menu seems to give a horizontal scrollbar instead of the name of the item e.g. cuisine#Coffee Shop
 * If you have both inputSets names and buildingAddress, and name= key is filled in then the basic tab will get both, surely only name should be shown and building name should be ignored e.g. cafes. [Actually this was an issue of addr: being missing from one of them, however this may still be a problem for other overlapping inputSets]

diff --git a/net/systemeD/potlatch2/EditController.as b/net/systemeD/potlatch2/EditController.as
index 9591f751b43ee1c16e0e5b13796901018b03401e..099697ceaf1120c545d58f7c228c7c417b778cba 100644 (file)
--- a/net/systemeD/potlatch2/EditController.as
+++ b/net/systemeD/potlatch2/EditController.as
@@ -103,7 +103,7 @@ package net.systemeD.potlatch2 {
                 return;
                 
             if ( state != null )
-                state.exitState();
+                state.exitState(newState);
             newState.setController(this);
             newState.setPreviousState(state);
             state = newState;

diff --git a/net/systemeD/potlatch2/TagViewer.mxml b/net/systemeD/potlatch2/TagViewer.mxml
index b3cd05f623cb089d4c7f445e5d29e44d3754e435..b9196cb949a4e69438a283570ffbedce3785b409 100644 (file)
--- a/net/systemeD/potlatch2/TagViewer.mxml
+++ b/net/systemeD/potlatch2/TagViewer.mxml
@@ -52,6 +52,7 @@
         </mx:HBox>
         <flexlib:SuperTabNavigator id="editorStack" width="100%" height="100%" paddingLeft="2" paddingRight="2"
             allowTabSqueezing="false" minTabWidth="10" closePolicy="close_never"
+                       updateComplete="tabSelected()" 
             scrollSpeed="20" change="ensureEditorsPopulated(IndexChangedEvent(event).relatedObject as VBox)"/>
       </mx:VBox>
 
@@ -262,6 +263,14 @@
               tab.addChild(component);
           }
       }
+
+       private function tabSelected():void {
+               if (editorStack.selectedIndex<0) { return; }
+               // This fixes a Flex TabNavigator bug where the tab would be selected, but not actually skinned properly
+               for (var i:uint=0; i<editorStack.numChildren; i++) {
+                       editorStack.getTabAt(i).selected=(i==editorStack.selectedIndex);
+               }
+       }
       
       private function checkAdvanced():void {
           if ( selectedEntity != null )

diff --git a/net/systemeD/potlatch2/controller/ControllerState.as b/net/systemeD/potlatch2/controller/ControllerState.as
index 67f6572893f152cc2afb1642abeb13dee31d46a9..b7f0b590a4bc63aa747256850e00fb2e1b4521c7 100644 (file)
--- a/net/systemeD/potlatch2/controller/ControllerState.as
+++ b/net/systemeD/potlatch2/controller/ControllerState.as
@@ -26,6 +26,10 @@ package net.systemeD.potlatch2.controller {
                 this.previousState = previousState;
         }
    
+               public function isSelectionState():Boolean {
+                       return true;
+               }
+
         public function processMouseEvent(event:MouseEvent, entity:Entity):ControllerState {
             return this;
         }
@@ -39,7 +43,7 @@ package net.systemeD.potlatch2.controller {
                }
 
         public function enterState():void {}
-        public function exitState():void {}
+        public function exitState(newState:ControllerState):void {}
 
                public function toString():String {
                        return "(No state)";

diff --git a/net/systemeD/potlatch2/controller/DragBackground.as b/net/systemeD/potlatch2/controller/DragBackground.as
index 222e40f5680fceb341813048c7161db3add2890b..307695df8a0eca7fbe43ea4198b2dcb0351285be 100644 (file)
--- a/net/systemeD/potlatch2/controller/DragBackground.as
+++ b/net/systemeD/potlatch2/controller/DragBackground.as
@@ -38,7 +38,7 @@ package net.systemeD.potlatch2.controller {
                        controller.map.draggable=false;
                        Globals.vars.root.addDebug("**** -> "+this);
         }
-        override public function exitState():void {
+        override public function exitState(newState:ControllerState):void {
                        controller.map.draggable=true;
                        Globals.vars.root.addDebug("**** <- "+this);
         }

diff --git a/net/systemeD/potlatch2/controller/DragPOINode.as b/net/systemeD/potlatch2/controller/DragPOINode.as
index 59e693e8ea9c1b1576db4982bfde674a8deab9fb..e8cc8f96d4f01fb6cd7b89ff9a7a4ca88889a00b 100644 (file)
--- a/net/systemeD/potlatch2/controller/DragPOINode.as
+++ b/net/systemeD/potlatch2/controller/DragPOINode.as
@@ -57,7 +57,7 @@ package net.systemeD.potlatch2.controller {
             controller.map.setHighlight(selectedNode, { highlight: true } );
                        Globals.vars.root.addDebug("**** -> "+this);
         }
-        override public function exitState():void {
+        override public function exitState(newState:ControllerState):void {
             controller.map.setHighlight(selectedNode, { highlight: false } );
                        Globals.vars.root.addDebug("**** <- "+this);
         }

diff --git a/net/systemeD/potlatch2/controller/DragWay.as b/net/systemeD/potlatch2/controller/DragWay.as
index 5eeb30d63a70ff27cbea33fee2b0a53cdd7f4faa..0e6e81172eb5c45d12204e0a5ea836ddc3dafc03 100644 (file)
--- a/net/systemeD/potlatch2/controller/DragWay.as
+++ b/net/systemeD/potlatch2/controller/DragWay.as
@@ -64,7 +64,7 @@ package net.systemeD.potlatch2.controller {
             controller.map.setHighlight(selectedWay, { highlight: true } );
                        Globals.vars.root.addDebug("**** -> "+this);
         }
-        override public function exitState():void {
+        override public function exitState(newState:ControllerState):void {
             controller.map.setHighlight(selectedWay, { highlight: false } );
                        Globals.vars.root.addDebug("**** <- "+this);
         }

diff --git a/net/systemeD/potlatch2/controller/DragWayNode.as b/net/systemeD/potlatch2/controller/DragWayNode.as
index 8957daff72b5c49ad903bc2c6df315ba1941c1b3..e3d42d0af04b9e3f8e8c1e413f18b53e6592b677 100644 (file)
--- a/net/systemeD/potlatch2/controller/DragWayNode.as
+++ b/net/systemeD/potlatch2/controller/DragWayNode.as
@@ -81,7 +81,7 @@ package net.systemeD.potlatch2.controller {
             controller.map.setHighlight(selectedWay, { showNodes: true } );
                        Globals.vars.root.addDebug("**** -> "+this);
         }
-        override public function exitState():void {
+        override public function exitState(newState:ControllerState):void {
             controller.map.setHighlight(selectedWay, { showNodes: false } );
                        Globals.vars.root.addDebug("**** <- "+this);
         }

diff --git a/net/systemeD/potlatch2/controller/DrawWay.as b/net/systemeD/potlatch2/controller/DrawWay.as
index eca24c998725d9101165ed5c601c01dce3395371..bae555f1a3c43159cdd7ad4f4e89de3c7060df07 100644 (file)
--- a/net/systemeD/potlatch2/controller/DrawWay.as
+++ b/net/systemeD/potlatch2/controller/DrawWay.as
@@ -196,8 +196,8 @@ package net.systemeD.potlatch2.controller {
                        controller.setCursor(controller.pen);
                        Globals.vars.root.addDebug("**** -> "+this);
                }
-               override public function exitState():void {
-                       super.exitState();
+               override public function exitState(newState:ControllerState):void {
+                       super.exitState(newState);
                        controller.setCursor(null);
                        elastic.removeSprites();
                        elastic = null;

diff --git a/net/systemeD/potlatch2/controller/NoSelection.as b/net/systemeD/potlatch2/controller/NoSelection.as
index e40eaa00295c343ddc966b80b4a50ced3f926f62..bc8d082c28dd36def4846b99c9ad62bb236685ad 100644 (file)
--- a/net/systemeD/potlatch2/controller/NoSelection.as
+++ b/net/systemeD/potlatch2/controller/NoSelection.as
@@ -13,6 +13,10 @@ package net.systemeD.potlatch2.controller {
                public function NoSelection() {
                }
 
+               override public function isSelectionState():Boolean {
+                       return false;
+               }
+               
                override public function processMouseEvent(event:MouseEvent, entity:Entity):ControllerState {
                        var focus:Entity = getTopLevelFocusEntity(entity);
 
@@ -39,7 +43,7 @@ package net.systemeD.potlatch2.controller {
         override public function enterState():void {
                        Globals.vars.root.addDebug("**** -> "+this);
         }
-        override public function exitState():void {
+        override public function exitState(newState:ControllerState):void {
                        Globals.vars.root.addDebug("**** <- "+this);
         }
                override public function toString():String {

diff --git a/net/systemeD/potlatch2/controller/SelectedPOINode.as b/net/systemeD/potlatch2/controller/SelectedPOINode.as
index 3eb14b3f34d3d56816e79f8dfd624fce14176c0a..fa278fd4731f4453fc85e5990610577a56753d2e 100644 (file)
--- a/net/systemeD/potlatch2/controller/SelectedPOINode.as
+++ b/net/systemeD/potlatch2/controller/SelectedPOINode.as
@@ -7,7 +7,7 @@ package net.systemeD.potlatch2.controller {
 
     public class SelectedPOINode extends ControllerState {
         protected var initNode:Node;
-        
+
         public function SelectedPOINode(node:Node) {
             initNode = node;
         }
@@ -16,17 +16,17 @@ package net.systemeD.potlatch2.controller {
             if ( node == selectedNode )
                 return;
 
-            clearSelection();
+            clearSelection(this);
             controller.setSelectedEntity(node);
             controller.map.setHighlight(node, { selected: true });
             selectedNode = node;
             initNode = node;
         }
                 
-        protected function clearSelection():void {
+        protected function clearSelection(newState:ControllerState):void {
             if ( selectedNode != null ) {
                 controller.map.setHighlight(selectedNode, { selected: false });
-                controller.setSelectedEntity(null);
+                if (!newState.isSelectionState()) { controller.setSelectedEntity(null); }
                 selectedNode = null;
             }
         }
@@ -57,9 +57,9 @@ package net.systemeD.potlatch2.controller {
             selectNode(initNode);
                        Globals.vars.root.addDebug("**** -> "+this);
         }
-        override public function exitState():void {
+        override public function exitState(newState:ControllerState):void {
                        controller.clipboards['node']=selectedNode.getTagsCopy();
-            clearSelection();
+            clearSelection(newState);
                        Globals.vars.root.addDebug("**** <- "+this);
         }
 

diff --git a/net/systemeD/potlatch2/controller/SelectedParallelWay.as b/net/systemeD/potlatch2/controller/SelectedParallelWay.as
index 50ce67b0cd43afa7cc1d106840f1f352e0968dc6..9720579dfd4409c1ce515d45cce793d5efdaf4d4 100644 (file)
--- a/net/systemeD/potlatch2/controller/SelectedParallelWay.as
+++ b/net/systemeD/potlatch2/controller/SelectedParallelWay.as
@@ -77,8 +77,8 @@ package net.systemeD.potlatch2.controller {
                        startlatp=controller.map.coord2latp(controller.map.mouseY);
                        Globals.vars.root.addDebug("**** -> "+this);
         }
-               override public function exitState():void {
-            clearSelection();
+               override public function exitState(newState:ControllerState):void {
+            clearSelection(newState);
                        Globals.vars.root.addDebug("**** <- "+this);
         }
 

diff --git a/net/systemeD/potlatch2/controller/SelectedWay.as b/net/systemeD/potlatch2/controller/SelectedWay.as
index 8228a0f20958ec60391c879602582c2ccb612aed..9c6a777b01112364f0e7528e50281919ff6ad78b 100644 (file)
--- a/net/systemeD/potlatch2/controller/SelectedWay.as
+++ b/net/systemeD/potlatch2/controller/SelectedWay.as
@@ -22,17 +22,17 @@ package net.systemeD.potlatch2.controller {
             if ( way == selectedWay )
                 return;
 
-            clearSelection();
+            clearSelection(this);
             controller.setSelectedEntity(way);
             controller.map.setHighlight(way, { selected: true, showNodes: true, hover: false });
             selectedWay = way;
             initWay = way;
         }
 
-        protected function clearSelection():void {
+        protected function clearSelection(newState:ControllerState):void {
             if ( selectedWay != null ) {
                controller.map.setHighlight(selectedWay, { selected: false, showNodes: false, hover: false });
-                controller.setSelectedEntity(null);
+                if (!newState.isSelectionState()) { controller.setSelectedEntity(null); }
                 selectedWay = null;
             }
         }
@@ -121,9 +121,9 @@ package net.systemeD.potlatch2.controller {
             selectWay(initWay);
                        Globals.vars.root.addDebug("**** -> "+this+" "+selectedWay.id);
         }
-        override public function exitState():void {
+        override public function exitState(newState:ControllerState):void {
                        controller.clipboards['way']=selectedWay.getTagsCopy();
-            clearSelection();
+            clearSelection(newState);
                        Globals.vars.root.addDebug("**** <- "+this);
         }
 

diff --git a/net/systemeD/potlatch2/controller/SelectedWayNode.as b/net/systemeD/potlatch2/controller/SelectedWayNode.as
index c87ac54f978321f3bd1aa087de717ef465805806..d6b96b51e3b0bf70eebbf248d0367d120887983d 100644 (file)
--- a/net/systemeD/potlatch2/controller/SelectedWayNode.as
+++ b/net/systemeD/potlatch2/controller/SelectedWayNode.as
@@ -20,7 +20,7 @@ package net.systemeD.potlatch2.controller {
             if ( way == selectedWay && node == selectedNode )
                 return;
 
-            clearSelection();
+            clearSelection(this);
             controller.setSelectedEntity(node);
             controller.map.setHighlight(way, { showNodes: true, nodeSelected: node.id });
             selectedWay = way; initWay = way;
@@ -28,10 +28,10 @@ package net.systemeD.potlatch2.controller {
             selectedNode = node;
         }
                 
-        override protected function clearSelection():void {
+        override protected function clearSelection(newState:ControllerState):void {
             if ( selectedNode != null ) {
                controller.map.setHighlight(selectedWay, { selected: false, showNodes: false, nodeSelected: null });
-                controller.setSelectedEntity(null);
+                if (!newState.isSelectionState()) { controller.setSelectedEntity(null); }
                 selectedNode = null;
                                selectedWay = null;
             }
@@ -75,9 +75,9 @@ package net.systemeD.potlatch2.controller {
             selectNode(initWay,initIndex);
                        Globals.vars.root.addDebug("**** -> "+this);
         }
-               override public function exitState():void {
+               override public function exitState(newState:ControllerState):void {
                        controller.clipboards['node']=selectedNode.getTagsCopy();
-            clearSelection();
+            clearSelection(newState);
                        Globals.vars.root.addDebug("**** <- "+this);
         }