Move the area and tiger stateClass assignment to use EntityUI.setStateClass, and...

diff --git a/net/systemeD/halcyon/EntityUI.as b/net/systemeD/halcyon/EntityUI.as
index 11cb0a76e7ac63ee7c515f0fa47921340ade2d26..f1c6c7c16d8bbb9fa027ef216f6af2e13617d7cc 100644 (file)
--- a/net/systemeD/halcyon/EntityUI.as
+++ b/net/systemeD/halcyon/EntityUI.as
@@ -168,6 +168,10 @@ package net.systemeD.halcyon {
                        if (changed) redraw();
         }
 
                        if (changed) redraw();
         }
 

+        /**
+        * Sets a state class (eg :hover, :dupe) for this entityUI. If the state class has changed it will
+        * invalidate the style list to force the style to be recalculated during redraw.
+        */

         public function setStateClass(stateType:String, isOn:*):Boolean {
                        if ( isOn == true ) { isOn='yes'; }
             if ( isOn && stateClasses[stateType] != isOn ) {
         public function setStateClass(stateType:String, isOn:*):Boolean {
                        if ( isOn == true ) { isOn='yes'; }
             if ( isOn && stateClasses[stateType] != isOn ) {


@@ -182,6 +186,10 @@ package net.systemeD.halcyon {
                        return false;
         }
 
                        return false;
         }
 

+        /**
+        * applies the state classes (eg :hover, :area) for this entityUI to the given list of 'real' tags.
+        * This then gives you a modified list of tags used for styling the entityUI.
+        */

                public function applyStateClasses(tags:Object):Object {
             for (var stateKey:String in stateClasses) {
                 tags[":"+stateKey] = 'yes';
                public function applyStateClasses(tags:Object):Object {
             for (var stateKey:String in stateClasses) {
                 tags[":"+stateKey] = 'yes';

diff --git a/net/systemeD/halcyon/WayUI.as b/net/systemeD/halcyon/WayUI.as
index c4f853e3ddb3b3342579964d109c074d4073b72d..748a5482b998070ba2605de19e9f598594140a94 100644 (file)
--- a/net/systemeD/halcyon/WayUI.as
+++ b/net/systemeD/halcyon/WayUI.as
@@ -192,9 +192,9 @@ package net.systemeD.halcyon {
 
             // Copy tags object, and add states
             var tags:Object = entity.getTagsCopy();
 
             // Copy tags object, and add states
             var tags:Object = entity.getTagsCopy();

-                       tags=applyStateClasses(tags);
-                       if (Way(entity).isArea()) { tags[':area']='yes'; }
-            if (entity.isUneditedTiger() && Globals.vars.highlightTiger) { tags[':tiger']='yes'; }
+            setStateClass('area', Way(entity).isArea());
+            setStateClass('tiger', (entity.isUneditedTiger() && Globals.vars.highlightTiger));
+            tags=applyStateClasses(tags);

 
                        // Keep track of maximum stroke width for hitzone
                        var maxwidth:Number=4;
 
                        // Keep track of maximum stroke width for hitzone
                        var maxwidth:Number=4;