You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2013/06/04 19:48:18 UTC
git commit: [flex-sdk] [refs/heads/develop] - update png.xml for full
run
Updated Branches:
refs/heads/develop 58c324ccc -> fd280d593
update png.xml for full run
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/fd280d59
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/fd280d59
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/fd280d59
Branch: refs/heads/develop
Commit: fd280d593bd821a5ba9062f7a5a8144a11d05be3
Parents: 58c324c
Author: Alex Harui <ah...@apache.org>
Authored: Tue Jun 4 10:48:09 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Jun 4 10:48:09 2013 -0700
----------------------------------------------------------------------
.../FxButton_Style_baseColor_disabled.png.xml | 155 +++++++++------
...FxToggleButton_Style_baseColor_disabled.png.xml | 20 +-
...on_icon_with_label_chromeColor_disabled.png.xml | 19 +-
3 files changed, 119 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fd280d59/mustella/tests/gumbo/components/Button/styles/baselines/FxButton_Style_baseColor_disabled.png.xml
----------------------------------------------------------------------
diff --git a/mustella/tests/gumbo/components/Button/styles/baselines/FxButton_Style_baseColor_disabled.png.xml b/mustella/tests/gumbo/components/Button/styles/baselines/FxButton_Style_baseColor_disabled.png.xml
index 7c2b5cf..436b8bc 100644
--- a/mustella/tests/gumbo/components/Button/styles/baselines/FxButton_Style_baseColor_disabled.png.xml
+++ b/mustella/tests/gumbo/components/Button/styles/baselines/FxButton_Style_baseColor_disabled.png.xml
@@ -4,67 +4,106 @@
<spark.components.Group width="500" height="375" blendMode="auto">
<spark.components.Group width="500" height="375" blendMode="auto">
<mx.containers.Canvas width="300" height="150">
- <spark.components.Button width="70" height="21">
- <spark.skins.spark.ButtonSkin width="70" height="21" blendMode="auto">
- <spark.components.Label x="10" y="3" width="50" height="17">
- <flash.display.Shape width="50" height="17"/>
- <flash.text.engine.TextLine x="25" y="13" width="0" height="15.95" ascent="12.4677734375" descent="3.43212890625" atomCount="1" hasGraphicElement="false"/>
- </spark.components.Label>
- </spark.skins.spark.ButtonSkin>
- </spark.components.Button>
+ <mx.core.FlexSprite width="72" height="23">
+ <spark.components.Button width="70" height="21">
+ <spark.skins.spark.ButtonSkin width="70" height="21" blendMode="auto">
+ <spark.components.Label x="10" y="3" width="50" height="17">
+ <flash.display.Shape width="50" height="17"/>
+ <flash.text.engine.TextLine x="25" y="13" width="0" height="15.95" ascent="12.4677734375" descent="3.43212890625" atomCount="1" hasGraphicElement="false"/>
+ </spark.components.Label>
+ </spark.skins.spark.ButtonSkin>
+ <spark.skins.spark.ErrorSkin width="0" height="0">
+ <flash.display.Bitmap matrix="(a=0.9722137451171875, b=0, c=0, d=0.9130401611328125, tx=0, ty=0)" width="70" height="21"/>
+ </spark.skins.spark.ErrorSkin>
+ </spark.components.Button>
+ </mx.core.FlexSprite>
</mx.containers.Canvas>
<mx.containers.Canvas y="156" width="150" height="150">
<mx.skins.spark.ContainerBorderSkin width="150" height="150" blendMode="auto"/>
- <mx.core.FlexSprite width="135" height="135" scrollRect="(x=0, y=0, w=135, h=135)">
- <mx.controls.List width="162" height="142">
- <mx.skins.spark.BorderSkin width="162" height="142" blendMode="auto"/>
- <mx.core.FlexShape matrix="(a=16, b=0, c=0, d=14, tx=1, ty=1)" x="1" y="1" width="160" height="140">
+ <mx.core.FlexSprite width="150" height="150" scrollRect="(x=0, y=0, w=150, h=150)">
+ <mx.controls.List width="74" height="450">
+ <mx.skins.spark.BorderSkin width="74" height="450" blendMode="auto"/>
+ <mx.core.FlexShape matrix="(a=7.1999969482421875, b=0, c=0, d=44.79998779296875, tx=1, ty=1)" x="1" y="1" width="72" height="448">
<mask>
- <mx.controls.listClasses.ListBaseContentHolder x="1" y="1" width="160" height="140">
+ <mx.controls.listClasses.ListBaseContentHolder x="1" y="1" width="72" height="448">
<mx.core.FlexSprite width="0" height="0"/>
- <mx.core.FlexSprite width="160" height="140"/>
+ <mx.core.FlexSprite width="72" height="448"/>
+ <data.MyButton width="80" height="60">
+ <mx.skins.spark.ButtonSkin width="80" height="60" blendMode="auto"/>
+ <mx.core.UITextField x="35" y="21" width="12" height="20" underline="false">
+ <htmlText><TEXTFORMAT LEADING="2"><P ALIGN="CENTER"><FONT FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0">6</FONT></P></TEXTFORMAT></htmlText>
+ </mx.core.UITextField>
+ </data.MyButton>
+ <data.MyButton x="2" y="66" width="70" height="60">
+ <mx.skins.spark.ButtonSkin width="70" height="60" blendMode="auto"/>
+ <mx.core.UITextField x="30" y="21" width="12" height="20" underline="false">
+ <htmlText><TEXTFORMAT LEADING="2"><P ALIGN="CENTER"><FONT FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0">5</FONT></P></TEXTFORMAT></htmlText>
+ </mx.core.UITextField>
+ </data.MyButton>
+ <data.MyButton x="2" y="130" width="70" height="60">
+ <mx.skins.spark.ButtonSkin width="70" height="60" blendMode="auto"/>
+ <mx.core.UITextField x="30" y="21" width="12" height="20" underline="false">
+ <htmlText><TEXTFORMAT LEADING="2"><P ALIGN="CENTER"><FONT FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0">6</FONT></P></TEXTFORMAT></htmlText>
+ </mx.core.UITextField>
+ </data.MyButton>
+ <data.MyButton x="2" y="130" width="70" height="60">
+ <mx.skins.spark.ButtonSkin width="70" height="60" blendMode="auto"/>
+ <mx.core.UITextField x="30" y="21" width="12" height="20" underline="false">
+ <htmlText><TEXTFORMAT LEADING="2"><P ALIGN="CENTER"><FONT FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0">3</FONT></P></TEXTFORMAT></htmlText>
+ </mx.core.UITextField>
+ </data.MyButton>
+ <data.MyButton x="2" y="2" width="70" height="60">
+ <mx.skins.spark.ButtonSkin width="70" height="60" blendMode="auto"/>
+ <mx.core.UITextField x="30" y="21" width="12" height="20" underline="false">
+ <htmlText><TEXTFORMAT LEADING="2"><P ALIGN="CENTER"><FONT FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0">4</FONT></P></TEXTFORMAT></htmlText>
+ </mx.core.UITextField>
+ </data.MyButton>
</mx.controls.listClasses.ListBaseContentHolder>
</mask>
</mx.core.FlexShape>
- <mx.controls.listClasses.ListBaseContentHolder x="1" y="1" width="160" height="140">
+ <mx.controls.listClasses.ListBaseContentHolder x="1" y="1" width="72" height="448">
<mask>
- <mx.core.FlexShape matrix="(a=16, b=0, c=0, d=14, tx=1, ty=1)" x="1" y="1" width="160" height="140"/>
+ <mx.core.FlexShape matrix="(a=7.1999969482421875, b=0, c=0, d=44.79998779296875, tx=1, ty=1)" x="1" y="1" width="72" height="448"/>
</mask>
<mx.core.FlexSprite width="0" height="0"/>
- <mx.core.FlexSprite width="160" height="140"/>
+ <mx.core.FlexSprite width="72" height="448"/>
+ <data.MyButton width="80" height="60">
+ <mx.skins.spark.ButtonSkin width="80" height="60" blendMode="auto"/>
+ <mx.core.UITextField x="35" y="21" width="12" height="20" underline="false">
+ <htmlText><TEXTFORMAT LEADING="2"><P ALIGN="CENTER"><FONT FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0">6</FONT></P></TEXTFORMAT></htmlText>
+ </mx.core.UITextField>
+ </data.MyButton>
+ <data.MyButton x="2" y="66" width="70" height="60">
+ <mx.skins.spark.ButtonSkin width="70" height="60" blendMode="auto"/>
+ <mx.core.UITextField x="30" y="21" width="12" height="20" underline="false">
+ <htmlText><TEXTFORMAT LEADING="2"><P ALIGN="CENTER"><FONT FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0">5</FONT></P></TEXTFORMAT></htmlText>
+ </mx.core.UITextField>
+ </data.MyButton>
+ <data.MyButton x="2" y="130" width="70" height="60">
+ <mx.skins.spark.ButtonSkin width="70" height="60" blendMode="auto"/>
+ <mx.core.UITextField x="30" y="21" width="12" height="20" underline="false">
+ <htmlText><TEXTFORMAT LEADING="2"><P ALIGN="CENTER"><FONT FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0">6</FONT></P></TEXTFORMAT></htmlText>
+ </mx.core.UITextField>
+ </data.MyButton>
+ <data.MyButton x="2" y="130" width="70" height="60">
+ <mx.skins.spark.ButtonSkin width="70" height="60" blendMode="auto"/>
+ <mx.core.UITextField x="30" y="21" width="12" height="20" underline="false">
+ <htmlText><TEXTFORMAT LEADING="2"><P ALIGN="CENTER"><FONT FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0">3</FONT></P></TEXTFORMAT></htmlText>
+ </mx.core.UITextField>
+ </data.MyButton>
+ <data.MyButton x="2" y="2" width="70" height="60">
+ <mx.skins.spark.ButtonSkin width="70" height="60" blendMode="auto"/>
+ <mx.core.UITextField x="30" y="21" width="12" height="20" underline="false">
+ <htmlText><TEXTFORMAT LEADING="2"><P ALIGN="CENTER"><FONT FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0">4</FONT></P></TEXTFORMAT></htmlText>
+ </mx.core.UITextField>
+ </data.MyButton>
</mx.controls.listClasses.ListBaseContentHolder>
</mx.controls.List>
</mx.core.FlexSprite>
- <mx.controls.HScrollBar matrix="(a=0, b=1, c=1, d=0, tx=0, ty=135)" y="135" width="135" height="15" cacheAsBitmap="true">
- <mx.controls.Button width="15" height="135">
- <mx.skins.spark.ScrollBarTrackSkin width="15" height="135" blendMode="auto"/>
- <mx.core.UITextField x="8" y="59" width="0" height="20" underline="false">
- <htmlText/>
- </mx.core.UITextField>
- </mx.controls.Button>
- <mx.controls.Button width="15" height="18">
- <mx.skins.spark.ScrollBarUpButtonSkin width="15" height="18"/>
- <mx.core.UITextField x="8" y="1" width="0" height="18" underline="false">
- <htmlText/>
- </mx.core.UITextField>
- </mx.controls.Button>
- <mx.controls.scrollClasses.ScrollThumb y="18" width="15" height="83" cacheAsBitmap="true">
- <mx.skins.spark.ScrollBarThumbSkin width="15" height="83" blendMode="auto"/>
- <mx.core.UITextField x="8" y="33" width="0" height="20" underline="false">
- <htmlText/>
- </mx.core.UITextField>
- </mx.controls.scrollClasses.ScrollThumb>
- <mx.controls.Button y="117" width="15" height="18">
- <mx.skins.spark.ScrollBarDownButtonSkin width="15" height="18"/>
- <mx.core.UITextField x="8" y="1" width="0" height="18" underline="false">
- <htmlText/>
- </mx.core.UITextField>
- </mx.controls.Button>
- </mx.controls.HScrollBar>
- <mx.controls.VScrollBar x="135" width="15" height="135" cacheAsBitmap="true">
- <mx.controls.Button width="15" height="135">
- <mx.skins.spark.ScrollBarTrackSkin width="15" height="135" blendMode="auto"/>
- <mx.core.UITextField x="8" y="59" width="0" height="20" underline="false">
+ <mx.controls.VScrollBar x="135" width="15" height="150" cacheAsBitmap="true">
+ <mx.controls.Button width="15" height="150">
+ <mx.skins.spark.ScrollBarTrackSkin width="15" height="150" blendMode="auto"/>
+ <mx.core.UITextField x="8" y="66" width="0" height="20" underline="false">
<htmlText/>
</mx.core.UITextField>
</mx.controls.Button>
@@ -74,20 +113,22 @@
<htmlText/>
</mx.core.UITextField>
</mx.controls.Button>
- <mx.controls.scrollClasses.ScrollThumb y="18" width="15" height="94" cacheAsBitmap="true">
- <mx.skins.spark.ScrollBarThumbSkin width="15" height="94" blendMode="auto"/>
- <mx.core.UITextField x="8" y="38" width="0" height="20" underline="false">
+ <mx.controls.scrollClasses.ScrollThumb y="18" width="15" height="38" cacheAsBitmap="true">
+ <mx.skins.spark.ScrollBarThumbSkin width="15" height="38" blendMode="auto"/>
+ <mx.core.UITextField x="8" y="10" width="0" height="20" underline="false">
<htmlText/>
</mx.core.UITextField>
</mx.controls.scrollClasses.ScrollThumb>
- <mx.controls.Button y="117" width="15" height="18">
+ <mx.controls.Button y="132" width="15" height="18">
<mx.skins.spark.ScrollBarDownButtonSkin width="15" height="18"/>
<mx.core.UITextField x="8" y="1" width="0" height="18" underline="false">
<htmlText/>
</mx.core.UITextField>
</mx.controls.Button>
</mx.controls.VScrollBar>
- <mx.core.FlexShape x="135" y="135" width="15" height="15"/>
+ <mx.core.FlexSprite width="150" height="150" scrollRect="(x=0, y=0, w=150, h=150)">
+ <mx.skins.halo.HaloFocusRect x="-2" y="-2" width="78" height="454"/>
+ </mx.core.FlexSprite>
</mx.containers.Canvas>
<spark.components.Button y="312" width="70" height="21">
<spark.skins.spark.ButtonSkin width="70" height="21" blendMode="auto">
@@ -127,11 +168,11 @@
</spark.components.Button>
</mx.containers.Canvas>
<mx.containers.Canvas y="400" width="100" height="100">
- <spark.components.Button width="60" height="30">
- <spark.skins.spark.ButtonSkin width="60" height="30" blendMode="auto">
- <spark.components.Label x="10" y="3" width="40" height="26">
- <flash.display.Shape width="40" height="26"/>
- <flash.text.engine.TextLine x="1.05" y="17.5" width="37.85" height="15.95" ascent="12.4677734375" descent="3.43212890625" atomCount="7" hasGraphicElement="false"/>
+ <spark.components.Button y="50" width="100" height="30">
+ <spark.skins.spark.ButtonSkin width="100" height="30" blendMode="auto">
+ <spark.components.Label x="10" y="3" width="80" height="26">
+ <flash.display.Shape width="80" height="26"/>
+ <flash.text.engine.TextLine x="14.55" y="17.5" width="50.9" height="15.95" ascent="12.4677734375" descent="3.43212890625" atomCount="9" hasGraphicElement="false"/>
</spark.components.Label>
</spark.skins.spark.ButtonSkin>
</spark.components.Button>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fd280d59/mustella/tests/gumbo/components/ToggleButton/styles/baselines/FxToggleButton_Style_baseColor_disabled.png.xml
----------------------------------------------------------------------
diff --git a/mustella/tests/gumbo/components/ToggleButton/styles/baselines/FxToggleButton_Style_baseColor_disabled.png.xml b/mustella/tests/gumbo/components/ToggleButton/styles/baselines/FxToggleButton_Style_baseColor_disabled.png.xml
index 18365de..28cc15f 100644
--- a/mustella/tests/gumbo/components/ToggleButton/styles/baselines/FxToggleButton_Style_baseColor_disabled.png.xml
+++ b/mustella/tests/gumbo/components/ToggleButton/styles/baselines/FxToggleButton_Style_baseColor_disabled.png.xml
@@ -40,19 +40,19 @@
</spark.skins.spark.ToggleButtonSkin>
</spark.components.ToggleButton>
</mx.containers.Canvas>
- <spark.components.ToggleButton y="88" width="70" height="21">
- <spark.skins.spark.ToggleButtonSkin width="70" height="21" blendMode="auto">
- <spark.components.Label x="10" y="3" width="50" height="17">
- <flash.display.Shape width="50" height="17"/>
- <flash.text.engine.TextLine x="25" y="13" width="0" height="15.95" ascent="12.4677734375" descent="3.43212890625" atomCount="1" hasGraphicElement="false"/>
+ <spark.components.ToggleButton y="88" width="85" height="21">
+ <spark.skins.spark.ToggleButtonSkin width="85" height="21" blendMode="auto">
+ <spark.components.Label x="10" y="3" width="65" height="17">
+ <flash.display.Shape width="65" height="17"/>
+ <flash.text.engine.TextLine x="0.15" y="13" width="64.65" height="15.95" ascent="12.4677734375" descent="3.43212890625" atomCount="12" hasGraphicElement="false"/>
</spark.components.Label>
</spark.skins.spark.ToggleButtonSkin>
</spark.components.ToggleButton>
- <spark.components.ToggleButton y="115" width="70" height="21">
- <spark.skins.spark.ToggleButtonSkin width="70" height="21" blendMode="auto">
- <spark.components.Label x="10" y="3" width="50" height="17">
- <flash.display.Shape width="50" height="17"/>
- <flash.text.engine.TextLine x="25" y="13" width="0" height="15.95" ascent="12.4677734375" descent="3.43212890625" atomCount="1" hasGraphicElement="false"/>
+ <spark.components.ToggleButton y="115" width="107" height="21">
+ <spark.skins.spark.ToggleButtonSkin width="107" height="21" blendMode="auto">
+ <spark.components.Label x="10" y="3" width="87" height="17">
+ <flash.display.Shape width="87" height="17"/>
+ <flash.text.engine.TextLine x="0.35" y="13" width="86.3" height="15.95" ascent="12.4677734375" descent="3.43212890625" atomCount="15" hasGraphicElement="false"/>
</spark.components.Label>
</spark.skins.spark.ToggleButtonSkin>
</spark.components.ToggleButton>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/fd280d59/mustella/tests/gumbo/components/ToggleButton/styles/baselines/togglebutton_icon_with_label_chromeColor_disabled.png.xml
----------------------------------------------------------------------
diff --git a/mustella/tests/gumbo/components/ToggleButton/styles/baselines/togglebutton_icon_with_label_chromeColor_disabled.png.xml b/mustella/tests/gumbo/components/ToggleButton/styles/baselines/togglebutton_icon_with_label_chromeColor_disabled.png.xml
index 4732b30..d676a2b 100644
--- a/mustella/tests/gumbo/components/ToggleButton/styles/baselines/togglebutton_icon_with_label_chromeColor_disabled.png.xml
+++ b/mustella/tests/gumbo/components/ToggleButton/styles/baselines/togglebutton_icon_with_label_chromeColor_disabled.png.xml
@@ -3,17 +3,20 @@
<spark.skins.spark.ApplicationSkin width="500" height="375" blendMode="auto">
<spark.components.Group width="500" height="375" blendMode="auto">
<spark.components.Group width="500" height="375" blendMode="auto">
- <spark.components.VGroup x="10" y="10" width="70" height="21" blendMode="auto">
- <spark.components.ToggleButton width="70" height="21">
- <spark.skins.spark.ToggleButtonSkin width="70" height="21" blendMode="auto">
- <spark.components.Label x="10" y="3" width="50" height="17">
- <flash.display.Shape width="50" height="17"/>
- <flash.text.engine.TextLine x="25" y="11.6" width="0" height="12.1" ascent="9.181640625" descent="2.8828125" atomCount="1" hasGraphicElement="false"/>
- </spark.components.Label>
+ <spark.components.VGroup x="10" y="10" width="70" height="47" blendMode="auto">
+ <spark.components.ToggleButton width="70" height="47">
+ <spark.skins.spark.ToggleButtonSkin width="70" height="47" blendMode="auto">
+ <spark.components.Group width="70" height="47" scrollRect="(x=0, y=0, w=70, h=47)" blendMode="auto">
+ <spark.components.supportClasses.InvalidatingSprite x="23" y="2" width="24" height="24"/>
+ <spark.components.Label x="10" y="33" width="50" height="13">
+ <flash.display.Shape width="50" height="13"/>
+ <flash.text.engine.TextLine x="11.95" y="9.6" width="26.05" height="12.1" ascent="9.181640625" descent="2.8828125" atomCount="4" hasGraphicElement="false"/>
+ </spark.components.Label>
+ </spark.components.Group>
</spark.skins.spark.ToggleButtonSkin>
</spark.components.ToggleButton>
</spark.components.VGroup>
- <comps.IconAsChildTag x="10" y="163" width="200" height="205" blendMode="auto">
+ <comps.IconAsChildTag x="10" y="163" width="131" height="72" blendMode="auto">
<spark.components.ToggleButton x="10" y="10" width="111" height="52">
<spark.skins.spark.ToggleButtonSkin concatenatedColorTransform="(redMultiplier=1, greenMultiplier=1, blueMultiplier=1, alphaMultiplier=1, redOffset=51, greenOffset=-204, blueOffset=-204, alphaOffset=0)" width="111" height="52" blendMode="auto">
<spark.components.Group concatenatedColorTransform="(redMultiplier=1, greenMultiplier=1, blueMultiplier=1, alphaMultiplier=1, redOffset=51, greenOffset=-204, blueOffset=-204, alphaOffset=0)" width="111" height="52" scrollRect="(x=0, y=0, w=111, h=52)" blendMode="auto">