Author: cframpton
Date: Tue Dec 11 21:28:09 2012
New Revision: 1420426
URL: http://svn.apache.org/viewvc?rev=1420426&view=rev
Log:
More font embedding.
Added:
incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbddedVerdana.png
(with props)
incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbeddedArial.png
(with props)
incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbddedVerdana.png
(with props)
incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbeddedArial.png
(with props)
Removed:
incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontfamily_arial.png
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/advanceddatagrid_styles_scrollcontrolbase.mxml
Added:
incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbddedVerdana.png
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbddedVerdana.png?rev=1420426&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbddedVerdana.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbeddedArial.png
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbeddedArial.png?rev=1420426&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbeddedArial.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbddedVerdana.png
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbddedVerdana.png?rev=1420426&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbddedVerdana.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbeddedArial.png
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbeddedArial.png?rev=1420426&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbeddedArial.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/advanceddatagrid_styles_scrollcontrolbase.mxml
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/advanceddatagrid_styles_scrollcontrolbase.mxml?rev=1420426&r1=1420425&r2=1420426&view=diff
==============================================================================
---
incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/advanceddatagrid_styles_scrollcontrolbase.mxml
(original)
+++
incubator/flex/sdk/branches/develop/mustella/tests/components/AdvancedDataGrid/Styles/advanceddatagrid_styles_scrollcontrolbase.mxml
Tue Dec 11 21:28:09 2012
@@ -64,7 +64,7 @@
}
public function setFF():void
{
- application.mydatagrid.setStyle("fontFamily","MyArial");
+ application.mydatagrid.setStyle("fontFamily","EmbeddedArial");
}
public function startApp():void
{
@@ -208,10 +208,13 @@
<RunCode code="startApp()" waitTarget="mydatagrid"
waitEvent="updateComplete"/>
</setup>
<body>
- <SetStyle target="mydatagrid" styleName="fontFamily"
value="Verdana" waitTarget="mydatagrid" waitEvent="updateComplete"/>
- <SetStyle target="mydatagrid" styleName="fontFamily"
value="MyArial" waitTarget="mydatagrid" waitEvent="updateComplete"/>
+ <SetStyle target="mydatagrid" styleName="fontFamily"
value="EmbddedVerdana" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid"
url="../Styles/Baselines/datagrid_fontfamily_arial.png" timeout="5000" />
+ <CompareBitmap target="mydatagrid"
url="../Styles/Baselines/$testID_EmbddedVerdana.png" timeout="5000" />
+
+ <SetStyle target="mydatagrid" styleName="fontFamily"
value="EmbeddedArial" waitTarget="mydatagrid" waitEvent="updateComplete"/>
+ <WaitForEffectsToEnd />
+ <CompareBitmap target="mydatagrid"
url="../Styles/Baselines/$testID_EmbeddedArial.png" timeout="5000" />
</body>
</TestCase>
@@ -219,13 +222,15 @@
<setup>
<ResetComponent target="mydatagrid"
className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid"
waitEvent="updateComplete"/>
<RunCode code="startApp()" waitTarget="mydatagrid"
waitEvent="updateComplete"/>
- <SetStyle target="mydatagrid" styleName="fontFamily"
value="Verdana" waitTarget="mydatagrid" waitEvent="updateComplete"/>
- <RunCode code="setFF()"/>
</setup>
<body>
- <SetStyle target="mydatagrid" styleName="fontFamily"
value="MyArial" waitTarget="mydatagrid" waitEvent="updateComplete"/>
+ <SetStyle target="mydatagrid" styleName="fontFamily"
value="EmbddedVerdana" waitTarget="mydatagrid" waitEvent="updateComplete"/>
+ <WaitForEffectsToEnd />
+ <CompareBitmap target="mydatagrid"
url="../Styles/Baselines/$testID_EmbddedVerdana.png" timeout="5000" />
+
+ <RunCode code="setFF()"/>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid"
url="../Styles/Baselines/datagrid_fontfamily_arial.png" timeout="5000" />
+ <CompareBitmap target="mydatagrid"
url="../Styles/Baselines/$testID_EmbeddedArial.png" timeout="5000" />
</body>
</TestCase>
