Updated Branches: refs/heads/develop e014a0d05 -> dc4ebc0b0
REVERT updated Mustella baselines to previous version, because the updated version does not look good. That will cause the test below to fail, until we find the reason for the change in the bitmap: mobile/components/ActionBar/styles/ActionBar_Styles ActionBar_TitleDisplay_TextDecoration Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/dc4ebc0b Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/dc4ebc0b Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/dc4ebc0b Branch: refs/heads/develop Commit: dc4ebc0b00fc8649efdf0a69aecd409b22bc7444 Parents: e014a0d Author: mamsellem <[email protected]> Authored: Wed Nov 20 01:03:27 2013 +0100 Committer: mamsellem <[email protected]> Committed: Wed Nov 20 01:03:27 2013 +0100 ---------------------------------------------------------------------- ...tleDisplay_TextDecoration@android_240ppi.png | Bin 2375 -> 2370 bytes ...isplay_TextDecoration@android_240ppi.png.xml | 56 +++++++++---------- 2 files changed, 25 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dc4ebc0b/mustella/tests/mobile/components/ActionBar/styles/baselines/ActionBar_TitleDisplay_TextDecoration@android_240ppi.png ---------------------------------------------------------------------- diff --git a/mustella/tests/mobile/components/ActionBar/styles/baselines/ActionBar_TitleDisplay_TextDecoration@android_240ppi.png b/mustella/tests/mobile/components/ActionBar/styles/baselines/ActionBar_TitleDisplay_TextDecoration@android_240ppi.png index ba251a6..dc1325c 100644 Binary files a/mustella/tests/mobile/components/ActionBar/styles/baselines/ActionBar_TitleDisplay_TextDecoration@android_240ppi.png and b/mustella/tests/mobile/components/ActionBar/styles/baselines/ActionBar_TitleDisplay_TextDecoration@android_240ppi.png differ http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dc4ebc0b/mustella/tests/mobile/components/ActionBar/styles/baselines/ActionBar_TitleDisplay_TextDecoration@android_240ppi.png.xml ---------------------------------------------------------------------- diff --git a/mustella/tests/mobile/components/ActionBar/styles/baselines/ActionBar_TitleDisplay_TextDecoration@android_240ppi.png.xml b/mustella/tests/mobile/components/ActionBar/styles/baselines/ActionBar_TitleDisplay_TextDecoration@android_240ppi.png.xml index 9242e37..323d4b3 100644 --- a/mustella/tests/mobile/components/ActionBar/styles/baselines/ActionBar_TitleDisplay_TextDecoration@android_240ppi.png.xml +++ b/mustella/tests/mobile/components/ActionBar/styles/baselines/ActionBar_TitleDisplay_TextDecoration@android_240ppi.png.xml @@ -21,28 +21,26 @@ <spark.components.Group width="0" height="0" blendMode="auto"/> <spark.components.Group width="0" height="0" blendMode="auto"/> <spark.components.Group width="0" height="0" blendMode="auto"/> - <ActionBarSkin.as$58.TitleDisplayComponent x="20" y="1" width="181" height="65"> + <ActionBarSkin.as$55.TitleDisplayComponent x="20" y="1" width="181" height="65"> <spark.components.supportClasses.StyleableTextField concatenatedColorTransform="(redMultiplier=1, greenMultiplier=1, blueMultiplier=1, alphaMultiplier=0.6484375, redOffset=0, greenOffset=0, blueOffset=0, alphaOffset=0)" x="-2" y="11.1" width="186" height="45" underline="true"> <htmlText><TEXTFORMAT LEADING="2"><P ALIGN="LEFT"><FONT FACE="MyVeraHalo" SIZE="28" COLOR="#000000" LETTERSPACING="0" KERNING="0"><B><U>Default Style</U></B></FONT></P></TEXTFORMAT></htmlText> </spark.components.supportClasses.StyleableTextField> <spark.components.supportClasses.StyleableTextField x="-2" y="10.1" width="186" height="45" underline="true"> <htmlText><TEXTFORMAT LEADING="2"><P ALIGN="LEFT"><FONT FACE="MyVeraHalo" SIZE="28" COLOR="#FFFFFF" LETTERSPACING="0" KERNING="0"><B><U>Default Style</U></B></FONT></P></TEXTFORMAT></htmlText> </spark.components.supportClasses.StyleableTextField> - </ActionBarSkin.as$58.TitleDisplayComponent> + </ActionBarSkin.as$55.TitleDisplayComponent> </spark.skins.mobile.ActionBarSkin> </comps.ActionBarBasic> <comps.ActionBarTitleBinding y="119" width="486" height="140" blendMode="auto"> <spark.components.HGroup width="247" height="67" blendMode="auto"> <spark.components.TextInput width="200" height="53"> - <spark.skins.mobile.ScrollingStageTextInputSkin width="200" height="53"> - <spark.components.supportClasses.ScrollableStageText x="9" y="9" width="182" height="35"> - <flash.display.Bitmap width="182" height="35"/> - </spark.components.supportClasses.ScrollableStageText> + <spark.skins.mobile.StageTextInputSkin width="200" height="53"> + <spark.components.supportClasses.StyleableStageText x="9" y="9" width="182" height="35"/> <spark.skins.mobile240.assets.TextInput_border width="200" height="53" blendMode="auto" scale9Grid="(x=8, y=8, w=282, h=34)"> <flash.display.Shape width="298" height="50"/> <flash.display.Shape concatenatedColorTransform="(redMultiplier=1, greenMultiplier=1, blueMultiplier=1, alphaMultiplier=0.19921875, redOffset=0, greenOffset=0, blueOffset=0, alphaOffset=0)" width="296" height="48"/> </spark.skins.mobile240.assets.TextInput_border> - </spark.skins.mobile.ScrollingStageTextInputSkin> + </spark.skins.mobile.StageTextInputSkin> </spark.components.TextInput> <spark.components.ActionBar x="206" width="41" height="67"> <spark.skins.mobile.ActionBarSkin width="41" height="67"> @@ -61,14 +59,14 @@ <spark.components.Group width="0" height="0" blendMode="auto"/> <spark.components.Group width="0" height="0" blendMode="auto"/> <spark.components.Group width="0" height="0" blendMode="auto"/> - <ActionBarSkin.as$58.TitleDisplayComponent x="20" y="1" width="1" height="65"> + <ActionBarSkin.as$55.TitleDisplayComponent x="20" y="1" width="1" height="65"> <spark.components.supportClasses.StyleableTextField concatenatedColorTransform="(redMultiplier=1, greenMultiplier=1, blueMultiplier=1, alphaMultiplier=0.6484375, redOffset=0, greenOffset=0, blueOffset=0, alphaOffset=0)" x="-2" y="11.1" width="6" height="4" underline="false"> <htmlText/> </spark.components.supportClasses.StyleableTextField> <spark.components.supportClasses.StyleableTextField x="-2" y="10.1" width="6" height="4" underline="false"> <htmlText/> </spark.components.supportClasses.StyleableTextField> - </ActionBarSkin.as$58.TitleDisplayComponent> + </ActionBarSkin.as$55.TitleDisplayComponent> </spark.skins.mobile.ActionBarSkin> </spark.components.ActionBar> </spark.components.HGroup> @@ -90,26 +88,24 @@ <spark.components.Group width="0" height="0" blendMode="auto"/> <spark.components.Group width="0" height="0" blendMode="auto"/> <spark.components.Group width="0" height="0" blendMode="auto"/> - <ActionBarSkin.as$58.TitleDisplayComponent x="20" y="1" width="240" height="65"> + <ActionBarSkin.as$55.TitleDisplayComponent x="20" y="1" width="240" height="65"> <spark.components.supportClasses.StyleableTextField concatenatedColorTransform="(redMultiplier=1, greenMultiplier=1, blueMultiplier=1, alphaMultiplier=0.6484375, redOffset=0, greenOffset=0, blueOffset=0, alphaOffset=0)" x="-2" y="11.1" width="245" height="45" underline="false"> <htmlText><TEXTFORMAT LEADING="2"><P ALIGN="LEFT"><FONT FACE="MyVeraHalo" SIZE="28" COLOR="#000000" LETTERSPACING="0" KERNING="0"><B>ActionBar source</B></FONT></P></TEXTFORMAT></htmlText> </spark.components.supportClasses.StyleableTextField> <spark.components.supportClasses.StyleableTextField x="-2" y="10.1" width="245" height="45" underline="false"> <htmlText><TEXTFORMAT LEADING="2"><P ALIGN="LEFT"><FONT FACE="MyVeraHalo" SIZE="28" COLOR="#FFFFFF" LETTERSPACING="0" KERNING="0"><B>ActionBar source</B></FONT></P></TEXTFORMAT></htmlText> </spark.components.supportClasses.StyleableTextField> - </ActionBarSkin.as$58.TitleDisplayComponent> + </ActionBarSkin.as$55.TitleDisplayComponent> </spark.skins.mobile.ActionBarSkin> </spark.components.ActionBar> <spark.components.TextInput x="286" width="200" height="53"> - <spark.skins.mobile.ScrollingStageTextInputSkin width="200" height="53"> - <spark.components.supportClasses.ScrollableStageText x="9" y="9" width="182" height="35"> - <flash.display.Bitmap width="182" height="35"/> - </spark.components.supportClasses.ScrollableStageText> + <spark.skins.mobile.StageTextInputSkin width="200" height="53"> + <spark.components.supportClasses.StyleableStageText x="9" y="9" width="182" height="35"/> <spark.skins.mobile240.assets.TextInput_border width="200" height="53" blendMode="auto" scale9Grid="(x=8, y=8, w=282, h=34)"> <flash.display.Shape width="298" height="50"/> <flash.display.Shape concatenatedColorTransform="(redMultiplier=1, greenMultiplier=1, blueMultiplier=1, alphaMultiplier=0.19921875, redOffset=0, greenOffset=0, blueOffset=0, alphaOffset=0)" width="296" height="48"/> </spark.skins.mobile240.assets.TextInput_border> - </spark.skins.mobile.ScrollingStageTextInputSkin> + </spark.skins.mobile.StageTextInputSkin> </spark.components.TextInput> </spark.components.HGroup> </comps.ActionBarTitleBinding> @@ -131,14 +127,14 @@ <spark.components.Group width="0" height="0" blendMode="auto"/> <spark.components.Group width="0" height="0" blendMode="auto"/> <spark.components.Group width="0" height="0" blendMode="auto"/> - <ActionBarSkin.as$58.TitleDisplayComponent x="20" y="1" width="1" height="65"> + <ActionBarSkin.as$55.TitleDisplayComponent x="20" y="1" width="1" height="65"> <spark.components.supportClasses.StyleableTextField concatenatedColorTransform="(redMultiplier=1, greenMultiplier=1, blueMultiplier=1, alphaMultiplier=0.6484375, redOffset=0, greenOffset=0, blueOffset=0, alphaOffset=0)" x="-2" y="11.1" width="6" height="4" underline="false"> <htmlText/> </spark.components.supportClasses.StyleableTextField> <spark.components.supportClasses.StyleableTextField x="-2" y="10.1" width="6" height="4" underline="false"> <htmlText/> </spark.components.supportClasses.StyleableTextField> - </ActionBarSkin.as$58.TitleDisplayComponent> + </ActionBarSkin.as$55.TitleDisplayComponent> </spark.skins.mobile.ActionBarSkin> </spark.components.ActionBar> </comps.ActionBarInGroup> @@ -181,14 +177,14 @@ </spark.skins.mobile.TransparentActionButtonSkin> </spark.components.Button> </spark.components.Group> - <ActionBarSkin.as$58.TitleDisplayComponent x="101" y="1" width="63" height="65"> + <ActionBarSkin.as$55.TitleDisplayComponent x="101" y="1" width="63" height="65"> <spark.components.supportClasses.StyleableTextField concatenatedColorTransform="(redMultiplier=1, greenMultiplier=1, blueMultiplier=1, alphaMultiplier=0.6484375, redOffset=0, greenOffset=0, blueOffset=0, alphaOffset=0)" x="-2" y="11.1" width="68" height="4" underline="false"> <htmlText/> </spark.components.supportClasses.StyleableTextField> <spark.components.supportClasses.StyleableTextField x="-2" y="10.1" width="68" height="4" underline="false"> <htmlText/> </spark.components.supportClasses.StyleableTextField> - </ActionBarSkin.as$58.TitleDisplayComponent> + </ActionBarSkin.as$55.TitleDisplayComponent> </spark.skins.mobile.ActionBarSkin> </comps.ActionBarStates> <comps.ActionBarStatesContent y="444" width="162" height="67"> @@ -225,14 +221,14 @@ </spark.skins.mobile.TransparentActionButtonSkin> </spark.components.Button> </spark.components.Group> - <ActionBarSkin.as$58.TitleDisplayComponent width="0" height="0"> + <ActionBarSkin.as$55.TitleDisplayComponent width="0" height="0"> <spark.components.supportClasses.StyleableTextField concatenatedColorTransform="(redMultiplier=1, greenMultiplier=1, blueMultiplier=1, alphaMultiplier=0.6484375, redOffset=0, greenOffset=0, blueOffset=0, alphaOffset=0)" x="-2" y="-21.4" width="5" height="4" underline="false"> <htmlText/> </spark.components.supportClasses.StyleableTextField> <spark.components.supportClasses.StyleableTextField x="-2" y="-22.4" width="5" height="4" underline="false"> <htmlText/> </spark.components.supportClasses.StyleableTextField> - </ActionBarSkin.as$58.TitleDisplayComponent> + </ActionBarSkin.as$55.TitleDisplayComponent> </spark.skins.mobile.ActionBarSkin> </comps.ActionBarStatesContent> <comps.ActionBarStatesLayout y="517" width="540" height="138"> @@ -345,14 +341,14 @@ </spark.skins.mobile.TransparentActionButtonSkin> </spark.components.Button> </spark.components.Group> - <ActionBarSkin.as$58.TitleDisplayComponent width="0" height="0"> + <ActionBarSkin.as$55.TitleDisplayComponent width="0" height="0"> <spark.components.supportClasses.StyleableTextField concatenatedColorTransform="(redMultiplier=1, greenMultiplier=1, blueMultiplier=1, alphaMultiplier=0.6484375, redOffset=0, greenOffset=0, blueOffset=0, alphaOffset=0)" x="-2" y="-21.4" width="5" height="4" underline="false"> <htmlText/> </spark.components.supportClasses.StyleableTextField> <spark.components.supportClasses.StyleableTextField x="-2" y="-22.4" width="5" height="4" underline="false"> <htmlText/> </spark.components.supportClasses.StyleableTextField> - </ActionBarSkin.as$58.TitleDisplayComponent> + </ActionBarSkin.as$55.TitleDisplayComponent> </spark.skins.mobile.ActionBarSkin> </comps.ActionBarStatesLayout> <comps.ActionBarMXMLStyles y="661" width="450" height="67"> @@ -372,26 +368,24 @@ <spark.components.Group width="0" height="0" blendMode="auto"/> <spark.components.Group y="1" width="450" height="65" blendMode="auto"> <spark.components.TextInput x="20" y="8" width="200" height="50"> - <spark.skins.mobile.ScrollingStageTextInputSkin width="200" height="50"> - <spark.components.supportClasses.ScrollableStageText x="9" y="15" width="182" height="32"> - <flash.display.Bitmap width="182" height="32"/> - </spark.components.supportClasses.ScrollableStageText> + <spark.skins.mobile.StageTextInputSkin width="200" height="50"> + <spark.components.supportClasses.StyleableStageText x="9" y="15" width="182" height="32"/> <spark.skins.mobile240.assets.TextInput_border width="200" height="50" blendMode="auto" scale9Grid="(x=8, y=8, w=282, h=34)"> <flash.display.Shape width="298" height="50"/> <flash.display.Shape concatenatedColorTransform="(redMultiplier=1, greenMultiplier=1, blueMultiplier=1, alphaMultiplier=0.19921875, redOffset=0, greenOffset=0, blueOffset=0, alphaOffset=0)" width="296" height="48"/> </spark.skins.mobile240.assets.TextInput_border> - </spark.skins.mobile.ScrollingStageTextInputSkin> + </spark.skins.mobile.StageTextInputSkin> </spark.components.TextInput> </spark.components.Group> <spark.components.Group width="0" height="0" blendMode="auto"/> - <ActionBarSkin.as$58.TitleDisplayComponent width="0" height="0"> + <ActionBarSkin.as$55.TitleDisplayComponent width="0" height="0"> <spark.components.supportClasses.StyleableTextField concatenatedColorTransform="(redMultiplier=1, greenMultiplier=1, blueMultiplier=1, alphaMultiplier=0.6484375, redOffset=0, greenOffset=0, blueOffset=0, alphaOffset=0)" x="-2" y="-14" width="5" height="4" underline="true"> <htmlText/> </spark.components.supportClasses.StyleableTextField> <spark.components.supportClasses.StyleableTextField x="-2" y="-15" width="5" height="4" underline="true"> <htmlText/> </spark.components.supportClasses.StyleableTextField> - </ActionBarSkin.as$58.TitleDisplayComponent> + </ActionBarSkin.as$55.TitleDisplayComponent> </spark.skins.mobile.ActionBarSkin> </comps.ActionBarMXMLStyles> </spark.components.Group>
