Changeset 16000 for lang/actionscript

Timestamp:

07/19/08 00:51:46 (4 months ago)

Author:

gyuque

Message:

supported color names

Location:

lang/actionscript/ascss/src

Files:

• KyotoDemo.as (modified) (5 diffs)
• KyotoDemo.swf (modified) (previous)
• css/CSSStyleSelector.as (modified) (1 diff)

lang/actionscript/ascss/src/KyotoDemo.as

@@ -81 +81 @@
                         mXMLField.x = 40;
                         mXMLField.y = 80;
-                        mXMLField.text = "<cho45>\n</cho45>";
+                        mXMLField.text = "<cho45>\n  <amachang />\n</cho45>";
                         new TabSender(mXMLField);
                         setTextFieldProperties(mXMLField);
@@ -432 +432 @@
                                 var rs:RenderStyle = ed.wrapper.renderStyle;
                                 var color:uint = lookupColorValue(rs, 0xffffffff, CSSPropertyID.CSSPropertyColor);
-                                var bgcolor:uint = lookupColorValue(rs, 0xffffffff, CSSPropertyID.CSSPropertyBackgroundColor);
+                                var bgcolor:uint = lookupColorValue(rs, 0, CSSPropertyID.CSSPropertyBackgroundColor);
                                 var bgurl:String = null;
-                                if (color != 0xffffffff)
+                                if (color != 0)
                                         mXMLField.setTextFormat(createColorFormat(color), ed.start_index, ed.end_index);
 
@@ -445 +445 @@
 
                                 var di:BGDisplayItem = null;
-                                if (bgcolor != 0xffffffff || bgurl)
+                                if (bgcolor != 0 || bgurl)
                                 {
                                         di = new BGDisplayItem();
-                                        di.color = bgcolor;
+                                        di.color = bgcolor & 0xffffff;
                                         di.url = bgurl;
                                         di.y = mXMLField.y + ed.lineno * LINEHEIGHT;
@@ -466 +466 @@
                         for each(var di:BGDisplayItem in mBGDisplayList.list)
                         {
-                                if (di.color != 0xffffffff)
+                                if (di.color != 0)
                                 {
                                         g.beginFill(di.color);
@@ -518 +518 @@
                                         if (cssv is CSSPrimitiveValue)
                                         {
-                                                var primv:CSSPrimitiveValue = cssv as CSSPrimitiveValue;
-                                                if (primv.primitiveType == CSSPrimitiveValue.CSS_RGBCOLOR)
-                                                        return primv.getRGBColorValue() & 0xffffff;
-                                                else if (primv.primitiveType == CSSPrimitiveValue.CSS_IDENT)
-                                                {
-                                                        if (primv.getIdent() == CSSValueKeywords.CSSValueTransparent)
-                                                                return 0xffffffff;
-                                                }
+                                                return CSSStyleSelector.getColorFromPrimitiveValue(CSSPrimitiveValue(cssv), defaultColor);
                                         }
                                 }

lang/actionscript/ascss/src/css/CSSStyleSelector.as

@@ -753 +753 @@
                         return !(r1 > r2);
                 }
+
+                public static function getColorFromPrimitiveValue(primitiveValue:CSSPrimitiveValue, defaultColor:uint):uint
+                {
+                        var col:uint = defaultColor;
+                        var ident:int = primitiveValue.getIdent();
+                        if (ident != 0)
+                        {
+                                if (ident >= CSSValueKeywords.CSSValueAqua && ident <= CSSValueKeywords.CSSValueTransparent)
+                            col = NAMED_COLORS[ident - CSSValueKeywords.CSSValueAqua];
+                        }
+                        else if (primitiveValue.primitiveType == CSSPrimitiveValue.CSS_RGBCOLOR)
+                        col = primitiveValue.getRGBColorValue();
+                        return col;
+                }
+
+                public static var NAMED_COLORS:Array = [
+                        0xFF00FFFF,
+                        0xFF000000,
+                        0xFF0000FF,
+                        0xFFFF00FF,
+                        0xFF808080,
+                        0xFF008000,
+                        0xFF00FF00,
+                        0xFF800000,
+                        0xFF000080,
+                        0xFF808000,
+                        0xFFFFA500,
+                        0xFF800080,
+                        0xFFFF0000,
+                        0xFFC0C0C0,
+                        0xFF008080,
+                        0xFFFFFFFF,
+                        0xFFFFFF00,
+                        0x00000000]
+                
         }
 }