Return-Path: 
 <flex-commits-return-1753-apmail-incubator-flex-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-flex-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-flex-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 4B8B9D7A5
	for <apmail-incubator-flex-commits-archive@minotaur.apache.org>;
 Thu, 13 Sep 2012 19:39:53 +0000 (UTC)
Received: (qmail 98449 invoked by uid 500); 13 Sep 2012 19:39:53 -0000
Delivered-To: apmail-incubator-flex-commits-archive@incubator.apache.org
Received: (qmail 98428 invoked by uid 500); 13 Sep 2012 19:39:53 -0000
Mailing-List: contact flex-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:flex-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:flex-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:flex-commits@incubator.apache.org>
List-Id: <flex-commits.incubator.apache.org>
Reply-To: flex-dev@incubator.apache.org
Delivered-To: mailing list flex-commits@incubator.apache.org
Received: (qmail 98419 invoked by uid 99); 13 Sep 2012 19:39:53 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Sep 2012 19:39:53 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Sep 2012 19:39:50 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 1B3DF23889BF;
	Thu, 13 Sep 2012 19:39:08 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: flex-commits@incubator.apache.org
From: pent@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120913193908.1B3DF23889BF@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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 />