incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r1384486 - in /incubator/flex/sdk/branches/develop/mustella/tests/components/Menu: Halo/SWFs/Menu_Basic.mxml Halo/Styles/Menu_Styles_ScrollControlBase.mxml Spark/SWFs/Menu_Basic_spark.mxml Spark/Styles/Menu_Styles_ScrollControlBase_spark.mxml
Date Thu, 13 Sep 2012 19:39:07 GMT
Author: pent
Date: Thu Sep 13 19:39:07 2012
New Revision: 1384486

URL: http://svn.apache.org/viewvc?rev=1384486&view=rev
Log:
Fixed font issues

Modified:
    incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Halo/SWFs/Menu_Basic.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Halo/Styles/Menu_Styles_ScrollControlBase.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Spark/SWFs/Menu_Basic_spark.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Spark/Styles/Menu_Styles_ScrollControlBase_spark.mxml

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Halo/SWFs/Menu_Basic.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Halo/SWFs/Menu_Basic.mxml?rev=1384486&r1=1384485&r2=1384486&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Halo/SWFs/Menu_Basic.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Halo/SWFs/Menu_Basic.mxml
Thu Sep 13 19:39:07 2012
@@ -81,7 +81,7 @@
     <mx:Style>
         @font-face {
             src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-regular.ttf");
-            fontFamily: ComicSansMS;
+            fontFamily: OpenSans;
 			embedAsCFF: false;
         }
         @font-face {

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Halo/Styles/Menu_Styles_ScrollControlBase.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Halo/Styles/Menu_Styles_ScrollControlBase.mxml?rev=1384486&r1=1384485&r2=1384486&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Halo/Styles/Menu_Styles_ScrollControlBase.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Halo/Styles/Menu_Styles_ScrollControlBase.mxml
Thu Sep 13 19:39:07 2012
@@ -110,7 +110,7 @@
                 <RunCode code="createAMenu2()" />
             </setup>
             <body>
-                <SetStyle styleName="fontFamily" value="ComicSansMS" target="menu1" />
+                <SetStyle styleName="fontFamily" value="OpenSans" target="menu1" />
                 <RunCode code="application.menu1.show()" waitTarget="menu1.mx_internal:popupTween"
waitEvent="tweenEnd" />
                 <DispatchKeyEvent keys="[DOWN, DOWN, DOWN, RIGHT]" waitTarget="menu1.mx_internal:subMenus.2.mx_internal:popupTween"
waitEvent="tweenEnd" />
                 <WaitForEffectsToEnd />

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Spark/SWFs/Menu_Basic_spark.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Spark/SWFs/Menu_Basic_spark.mxml?rev=1384486&r1=1384485&r2=1384486&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Spark/SWFs/Menu_Basic_spark.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Spark/SWFs/Menu_Basic_spark.mxml
Thu Sep 13 19:39:07 2012
@@ -86,7 +86,7 @@
 
         @font-face {
             src: url("../../../../../Assets/Fonts/Cousine/Cousine-Regular.ttf");
-            fontFamily: ComicSansMS;
+            fontFamily: Cousine;
             embedAsCFF: false;
         }
         /* FIXME: need embedded font swf file

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Spark/Styles/Menu_Styles_ScrollControlBase_spark.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Spark/Styles/Menu_Styles_ScrollControlBase_spark.mxml?rev=1384486&r1=1384485&r2=1384486&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Spark/Styles/Menu_Styles_ScrollControlBase_spark.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/Menu/Spark/Styles/Menu_Styles_ScrollControlBase_spark.mxml
Thu Sep 13 19:39:07 2012
@@ -82,16 +82,16 @@
     </mx:Script>
 
     <testCases>
-        <TestCase testID="fontFamily_Arial" description="Menu style fontFamily=Arial."
keywords="[styles, fontFamily, Menu]">
+        <TestCase testID="fontFamily_Verdana" description="Menu style fontFamily=Verdana."
keywords="[styles, fontFamily, Menu]">
             <setup>
                 <RunCode code="createAMenu2()" />
-                <SetStyle styleName="fontFamily" target="menu1" value="Arial" />
+                <SetStyle styleName="fontFamily" target="menu1" value="MyVerdana" />
             </setup>
             <body>
                 <RunCode code="application.menu1.show()" waitTarget="menu1" waitEvent="menuShow"
/>
                 <DispatchKeyEvent keys="[DOWN, DOWN, DOWN, RIGHT]" waitTarget="menu1"
waitEvent="menuShow" />
                 <WaitForEffectsToEnd />
-                <CompareBitmap numColorVariances="4" maxColorVariance="8"  target="menu1.mx_internal:subMenus.2.mx_internal:rendererArray.1.0"
url="../Styles/baselines/menu_fontFamily_Arial.png" timeout="2500" />
+                <CompareBitmap numColorVariances="4" maxColorVariance="8"  target="menu1.mx_internal:subMenus.2.mx_internal:rendererArray.1.0"
url="../Styles/baselines/menu_fontFamily_Verdana.png" timeout="2500" />
             </body>
         </TestCase>
 <!--
@@ -111,12 +111,12 @@ FIXME: Hancock relies on a font swf file
             </body>
         </TestCase>
 -->
-        <TestCase testID="fontFamily_emenu1edded" description="Menu style fontFamily=emenu1edded
font Comic Sans." keywords="[styles, fontFamily, Menu]">
+        <TestCase testID="fontFamily_emenu1edded" description="Menu style fontFamily=emenu1edded
font Cousine." keywords="[styles, fontFamily, Menu]">
             <setup>
                 <RunCode code="createAMenu2()" />
             </setup>
             <body>
-                <SetStyle styleName="fontFamily" value="ComicSansMS" target="menu1" />
+                <SetStyle styleName="fontFamily" value="Cousine" target="menu1" />
                 <RunCode code="application.menu1.show()" waitTarget="menu1" waitEvent="menuShow"
/>
                 <DispatchKeyEvent keys="[DOWN, DOWN, DOWN, RIGHT]" waitTarget="menu1"
waitEvent="menuShow" />
                 <WaitForEffectsToEnd />



Mime
View raw message