flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject git commit: [flex-sdk] [refs/heads/develop] - These tests didn't have fonts embedded correctly
Date Sat, 08 Jun 2013 05:29:36 GMT
Updated Branches:
  refs/heads/develop 2601af629 -> 1cb7c3608


These tests didn't have fonts embedded correctly


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/1cb7c360
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/1cb7c360
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/1cb7c360

Branch: refs/heads/develop
Commit: 1cb7c3608dad8bac99e90c5a331ef3eecc54eae1
Parents: 2601af6
Author: Alex Harui <aharui@apache.org>
Authored: Fri Jun 7 22:14:36 2013 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Fri Jun 7 22:17:03 2013 -0700

----------------------------------------------------------------------
 .../FxButton_Style_baseColor_disabled.png.xml      |   44 +++++++-------
 .../components/Button/swfs/Flex4_Button_main.mxml  |    7 ++-
 ...FxToggleButton_Style_baseColor_disabled.png.xml |    9 +--
 .../ToggleButton/swfs/Flex4_ToggleButton_main.mxml |    8 ++-
 4 files changed, 39 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1cb7c360/mustella/tests/gumbo/components/Button/styles/baselines/FxButton_Style_baseColor_disabled.png.xml
----------------------------------------------------------------------
diff --git a/mustella/tests/gumbo/components/Button/styles/baselines/FxButton_Style_baseColor_disabled.png.xml
b/mustella/tests/gumbo/components/Button/styles/baselines/FxButton_Style_baseColor_disabled.png.xml
index 436b8bc..646d6d1 100644
--- a/mustella/tests/gumbo/components/Button/styles/baselines/FxButton_Style_baseColor_disabled.png.xml
+++ b/mustella/tests/gumbo/components/Button/styles/baselines/FxButton_Style_baseColor_disabled.png.xml
@@ -30,32 +30,32 @@
                       <mx.core.FlexSprite width="72" height="448"/>
                       <data.MyButton width="80" height="60">
                         <mx.skins.spark.ButtonSkin width="80" height="60" blendMode="auto"/>
-                        <mx.core.UITextField x="35" y="21" width="12" height="20" underline="false">
-                          <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P
ALIGN="CENTER"&gt;&lt;FONT FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0"
KERNING="0"&gt;6&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
+                        <mx.core.UITextField x="35" y="20" width="13" height="22" underline="false">
+                          <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P
ALIGN="CENTER"&gt;&lt;FONT FACE="myArialHalo" SIZE="12" COLOR="#000000" LETTERSPACING="0"
KERNING="0"&gt;6&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
                         </mx.core.UITextField>
                       </data.MyButton>
                       <data.MyButton x="2" y="66" width="70" height="60">
                         <mx.skins.spark.ButtonSkin width="70" height="60" blendMode="auto"/>
-                        <mx.core.UITextField x="30" y="21" width="12" height="20" underline="false">
-                          <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P
ALIGN="CENTER"&gt;&lt;FONT FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0"
KERNING="0"&gt;5&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
+                        <mx.core.UITextField x="30" y="20" width="13" height="22" underline="false">
+                          <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P
ALIGN="CENTER"&gt;&lt;FONT FACE="myArialHalo" SIZE="12" COLOR="#000000" LETTERSPACING="0"
KERNING="0"&gt;5&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
                         </mx.core.UITextField>
                       </data.MyButton>
                       <data.MyButton x="2" y="130" width="70" height="60">
                         <mx.skins.spark.ButtonSkin width="70" height="60" blendMode="auto"/>
-                        <mx.core.UITextField x="30" y="21" width="12" height="20" underline="false">
-                          <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P
ALIGN="CENTER"&gt;&lt;FONT FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0"
KERNING="0"&gt;6&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
+                        <mx.core.UITextField x="30" y="20" width="13" height="22" underline="false">
+                          <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P
ALIGN="CENTER"&gt;&lt;FONT FACE="myArialHalo" SIZE="12" COLOR="#000000" LETTERSPACING="0"
KERNING="0"&gt;6&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
                         </mx.core.UITextField>
                       </data.MyButton>
                       <data.MyButton x="2" y="130" width="70" height="60">
                         <mx.skins.spark.ButtonSkin width="70" height="60" blendMode="auto"/>
-                        <mx.core.UITextField x="30" y="21" width="12" height="20" underline="false">
-                          <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P
ALIGN="CENTER"&gt;&lt;FONT FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0"
KERNING="0"&gt;3&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
+                        <mx.core.UITextField x="30" y="20" width="13" height="22" underline="false">
+                          <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P
ALIGN="CENTER"&gt;&lt;FONT FACE="myArialHalo" SIZE="12" COLOR="#000000" LETTERSPACING="0"
KERNING="0"&gt;3&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
                         </mx.core.UITextField>
                       </data.MyButton>
                       <data.MyButton x="2" y="2" width="70" height="60">
                         <mx.skins.spark.ButtonSkin width="70" height="60" blendMode="auto"/>
-                        <mx.core.UITextField x="30" y="21" width="12" height="20" underline="false">
-                          <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P
ALIGN="CENTER"&gt;&lt;FONT FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0"
KERNING="0"&gt;4&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
+                        <mx.core.UITextField x="30" y="20" width="13" height="22" underline="false">
+                          <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P
ALIGN="CENTER"&gt;&lt;FONT FACE="myArialHalo" SIZE="12" COLOR="#000000" LETTERSPACING="0"
KERNING="0"&gt;4&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
                         </mx.core.UITextField>
                       </data.MyButton>
                     </mx.controls.listClasses.ListBaseContentHolder>
@@ -69,32 +69,32 @@
                   <mx.core.FlexSprite width="72" height="448"/>
                   <data.MyButton width="80" height="60">
                     <mx.skins.spark.ButtonSkin width="80" height="60" blendMode="auto"/>
-                    <mx.core.UITextField x="35" y="21" width="12" height="20" underline="false">
-                      <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P ALIGN="CENTER"&gt;&lt;FONT
FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0"&gt;6&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
+                    <mx.core.UITextField x="35" y="20" width="13" height="22" underline="false">
+                      <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P ALIGN="CENTER"&gt;&lt;FONT
FACE="myArialHalo" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0"&gt;6&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
                     </mx.core.UITextField>
                   </data.MyButton>
                   <data.MyButton x="2" y="66" width="70" height="60">
                     <mx.skins.spark.ButtonSkin width="70" height="60" blendMode="auto"/>
-                    <mx.core.UITextField x="30" y="21" width="12" height="20" underline="false">
-                      <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P ALIGN="CENTER"&gt;&lt;FONT
FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0"&gt;5&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
+                    <mx.core.UITextField x="30" y="20" width="13" height="22" underline="false">
+                      <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P ALIGN="CENTER"&gt;&lt;FONT
FACE="myArialHalo" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0"&gt;5&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
                     </mx.core.UITextField>
                   </data.MyButton>
                   <data.MyButton x="2" y="130" width="70" height="60">
                     <mx.skins.spark.ButtonSkin width="70" height="60" blendMode="auto"/>
-                    <mx.core.UITextField x="30" y="21" width="12" height="20" underline="false">
-                      <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P ALIGN="CENTER"&gt;&lt;FONT
FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0"&gt;6&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
+                    <mx.core.UITextField x="30" y="20" width="13" height="22" underline="false">
+                      <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P ALIGN="CENTER"&gt;&lt;FONT
FACE="myArialHalo" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0"&gt;6&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
                     </mx.core.UITextField>
                   </data.MyButton>
                   <data.MyButton x="2" y="130" width="70" height="60">
                     <mx.skins.spark.ButtonSkin width="70" height="60" blendMode="auto"/>
-                    <mx.core.UITextField x="30" y="21" width="12" height="20" underline="false">
-                      <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P ALIGN="CENTER"&gt;&lt;FONT
FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0"&gt;3&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
+                    <mx.core.UITextField x="30" y="20" width="13" height="22" underline="false">
+                      <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P ALIGN="CENTER"&gt;&lt;FONT
FACE="myArialHalo" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0"&gt;3&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
                     </mx.core.UITextField>
                   </data.MyButton>
                   <data.MyButton x="2" y="2" width="70" height="60">
                     <mx.skins.spark.ButtonSkin width="70" height="60" blendMode="auto"/>
-                    <mx.core.UITextField x="30" y="21" width="12" height="20" underline="false">
-                      <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P ALIGN="CENTER"&gt;&lt;FONT
FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0"&gt;4&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
+                    <mx.core.UITextField x="30" y="20" width="13" height="22" underline="false">
+                      <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P ALIGN="CENTER"&gt;&lt;FONT
FACE="myArialHalo" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0"&gt;4&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
                     </mx.core.UITextField>
                   </data.MyButton>
                 </mx.controls.listClasses.ListBaseContentHolder>
@@ -103,7 +103,7 @@
             <mx.controls.VScrollBar x="135" width="15" height="150" cacheAsBitmap="true">
               <mx.controls.Button width="15" height="150">
                 <mx.skins.spark.ScrollBarTrackSkin width="15" height="150" blendMode="auto"/>
-                <mx.core.UITextField x="8" y="66" width="0" height="20" underline="false">
+                <mx.core.UITextField x="8" y="65" width="0" height="22" underline="false">
                   <htmlText/>
                 </mx.core.UITextField>
               </mx.controls.Button>
@@ -115,7 +115,7 @@
               </mx.controls.Button>
               <mx.controls.scrollClasses.ScrollThumb y="18" width="15" height="38" cacheAsBitmap="true">
                 <mx.skins.spark.ScrollBarThumbSkin width="15" height="38" blendMode="auto"/>
-                <mx.core.UITextField x="8" y="10" width="0" height="20" underline="false">
+                <mx.core.UITextField x="8" y="9" width="0" height="22" underline="false">
                   <htmlText/>
                 </mx.core.UITextField>
               </mx.controls.scrollClasses.ScrollThumb>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1cb7c360/mustella/tests/gumbo/components/Button/swfs/Flex4_Button_main.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/gumbo/components/Button/swfs/Flex4_Button_main.mxml b/mustella/tests/gumbo/components/Button/swfs/Flex4_Button_main.mxml
index 02c2e84..9855fbf 100644
--- a/mustella/tests/gumbo/components/Button/swfs/Flex4_Button_main.mxml
+++ b/mustella/tests/gumbo/components/Button/swfs/Flex4_Button_main.mxml
@@ -119,7 +119,12 @@
 			fontFamily:myArialHalo;
 		}
 
-		
+        mx|Button{
+            fontAntiAliasType: "normal";
+            fontFamily: myArialHalo;
+            fontLookup: "embeddedCFF";
+        }
+
 	</fx:Style>
 
 	<mx:Canvas id="panel1" height="150" width="300">

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1cb7c360/mustella/tests/gumbo/components/ToggleButton/styles/baselines/FxToggleButton_Style_baseColor_disabled.png.xml
----------------------------------------------------------------------
diff --git a/mustella/tests/gumbo/components/ToggleButton/styles/baselines/FxToggleButton_Style_baseColor_disabled.png.xml
b/mustella/tests/gumbo/components/ToggleButton/styles/baselines/FxToggleButton_Style_baseColor_disabled.png.xml
index 28cc15f..a54add5 100644
--- a/mustella/tests/gumbo/components/ToggleButton/styles/baselines/FxToggleButton_Style_baseColor_disabled.png.xml
+++ b/mustella/tests/gumbo/components/ToggleButton/styles/baselines/FxToggleButton_Style_baseColor_disabled.png.xml
@@ -56,11 +56,10 @@
               </spark.components.Label>
             </spark.skins.spark.ToggleButtonSkin>
           </spark.components.ToggleButton>
-          <mx.controls.Label y="142" width="30" height="20">
-            <mx.core.UITextField width="30" height="20" underline="false">
-              <htmlText>&lt;TEXTFORMAT LEADING="2"&gt;&lt;P ALIGN="LEFT"&gt;&lt;FONT
FACE="Arial" SIZE="12" COLOR="#000000" LETTERSPACING="0" KERNING="0"&gt;false&lt;/FONT&gt;&lt;/P&gt;&lt;/TEXTFORMAT&gt;</htmlText>
-            </mx.core.UITextField>
-          </mx.controls.Label>
+          <spark.components.Label y="142" width="26" height="16">
+            <flash.display.Shape width="26" height="16"/>
+            <flash.text.engine.TextLine y="12.45" width="25.05" height="15.95" ascent="12.4677734375"
descent="3.43212890625" atomCount="5" hasGraphicElement="false"/>
+          </spark.components.Label>
         </spark.components.Group>
       </spark.components.Group>
     </spark.skins.spark.ApplicationSkin>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1cb7c360/mustella/tests/gumbo/components/ToggleButton/swfs/Flex4_ToggleButton_main.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/gumbo/components/ToggleButton/swfs/Flex4_ToggleButton_main.mxml
b/mustella/tests/gumbo/components/ToggleButton/swfs/Flex4_ToggleButton_main.mxml
index dac996b..1f96ccc 100644
--- a/mustella/tests/gumbo/components/ToggleButton/swfs/Flex4_ToggleButton_main.mxml
+++ b/mustella/tests/gumbo/components/ToggleButton/swfs/Flex4_ToggleButton_main.mxml
@@ -76,6 +76,12 @@
 			fontLookup: "embeddedCFF";
 		}
 
+        s|Label{
+            fontAntiAliasType: "normal";
+            fontFamily: myArial;
+            fontLookup: "embeddedCFF";
+        }
+        
 		.redText {
 		    color: #FF0000;
 		    fontWeight: "bold";
@@ -107,6 +113,6 @@
     
     <s:ToggleButton id="myTB2" creationComplete="initListener()" />
     <s:ToggleButton id="myTB3" />
-    <mx:Label id="myLabel" text="{myTB3.selected.toString()}" />
+    <s:Label id="myLabel" text="{myTB3.selected.toString()}" />
     
 </s:Application>


Mime
View raw message