Repository: flex-sdk Updated Branches: refs/heads/develop c03cf753d -> cf3f86fff
fix failing advancedcss test on windows. The button was in the dropshadow of a panel and was rendered differently on FP14 vs FP11. I moved the button below the dropshadow Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/cf3f86ff Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/cf3f86ff Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/cf3f86ff Branch: refs/heads/develop Commit: cf3f86ffff2ae508c9a5f5828dc04d094d5c48c6 Parents: c03cf75 Author: Alex Harui <aha...@apache.org> Authored: Sat Aug 16 01:19:38 2014 +0100 Committer: Alex Harui <aha...@apache.org> Committed: Sat Aug 16 01:23:02 2014 +0100 ---------------------------------------------------------------------- .../DescendantSelectors_main_runtimeCSS.mxml | 2 ++ ...vancedCSS_descendantSelectors_RuntimeCSS.mxml | 2 +- ...lector_basic_nomatch_style_runtime...@win.png | Bin 1447 -> 1239 bytes 3 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cf3f86ff/mustella/tests/Managers/StyleManager/AdvancedCSS/SWFs/DescendantSelectors_main_runtimeCSS.mxml ---------------------------------------------------------------------- diff --git a/mustella/tests/Managers/StyleManager/AdvancedCSS/SWFs/DescendantSelectors_main_runtimeCSS.mxml b/mustella/tests/Managers/StyleManager/AdvancedCSS/SWFs/DescendantSelectors_main_runtimeCSS.mxml index 39674f7..61767cf 100644 --- a/mustella/tests/Managers/StyleManager/AdvancedCSS/SWFs/DescendantSelectors_main_runtimeCSS.mxml +++ b/mustella/tests/Managers/StyleManager/AdvancedCSS/SWFs/DescendantSelectors_main_runtimeCSS.mxml @@ -64,6 +64,8 @@ <comps:PanelComp id="panel2" /> <comps:TitleWindowComp id="tw1" /> </mx:HBox> + <!-- get the button out of the panel dropshadow --> + <mx:Spacer width="100" height="100" /> <mx:Button label="What color am I?" id="main_button1"/> <s:Button id="openButton" label="open pop up" click="openWindow(false)"/> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cf3f86ff/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_RuntimeCSS.mxml ---------------------------------------------------------------------- diff --git a/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_RuntimeCSS.mxml b/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_RuntimeCSS.mxml index f0b3f8f..2089e01 100644 --- a/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_RuntimeCSS.mxml +++ b/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_RuntimeCSS.mxml @@ -166,7 +166,7 @@ </setup> <body> <RunCode code="application.panel1.addChild(new comps.CanvasComp())" waitTarget="panel1" waitEvent="updateComplete" /> - <CompareBitmap url="../descendantSelectors/baselines/$testID_2.png" target="panel1.getChildAt(4).checkbox1" /> + <CompareBitmap url="../descendantSelectors/baselines/$testID_2.png" target="panel1.getChildAt(4).checkbox1" numColorVariances="1" maxColorVariance="16" /> </body> </TestCase> <TestCase testID="descendantSelector_subclassParent_style" keywords="[CSS, descendant selector]" http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cf3f86ff/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantselector_basic_nomatch_style_runtime...@win.png ---------------------------------------------------------------------- diff --git a/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantselector_basic_nomatch_style_runtime...@win.png b/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantselector_basic_nomatch_style_runtime...@win.png index facbe87..5bc53c4 100644 Binary files a/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantselector_basic_nomatch_style_runtime...@win.png and b/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantselector_basic_nomatch_style_runtime...@win.png differ
