flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject svn commit: r1434472 - in /flex/sdk/branches/develop/mustella/tests/mobile/components/Button: properties/ styles/ styles/baselines/ swfs/
Date Wed, 16 Jan 2013 23:08:57 GMT
Author: aharui
Date: Wed Jan 16 23:08:56 2013
New Revision: 1434472

URL: http://svn.apache.org/viewvc?rev=1434472&view=rev
Log:
Need to embed one more font.  Also add some pixel tolerances on a few tests.

Modified:
    flex/sdk/branches/develop/mustella/tests/mobile/components/Button/properties/button_icon_properties.mxml
    flex/sdk/branches/develop/mustella/tests/mobile/components/Button/properties/button_properties.mxml
    flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/Mobile_Button_styles_fontFamily_CourierNew@android_240ppi.png
    flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/Mobile_Button_styles_fontFamily_CourierNew_setStyle@android_240ppi.png
    flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/Mobile_Button_styles_fontSetting_disabled@android_240ppi.png
    flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/Mobile_Button_styles_fontSetting_selected@android_240ppi.png
    flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/Mobile_Button_styles_font_styleName@android_240ppi.png
    flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/button_styles.mxml
    flex/sdk/branches/develop/mustella/tests/mobile/components/Button/swfs/MobileButtonMain.mxml

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Button/properties/button_icon_properties.mxml
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/properties/button_icon_properties.mxml?rev=1434472&r1=1434471&r2=1434472&view=diff
==============================================================================
--- flex/sdk/branches/develop/mustella/tests/mobile/components/Button/properties/button_icon_properties.mxml
(original)
+++ flex/sdk/branches/develop/mustella/tests/mobile/components/Button/properties/button_icon_properties.mxml
Wed Jan 16 23:08:56 2013
@@ -150,7 +150,7 @@
 						<SetStyle target="btn1" styleName="icon" value="{fxgCls}" waitEvent="updateComplete"
waitTarget="btn1"/>
 					</setup>
 					<body>
-						<CompareBitmap url="../properties/baselines" target="btn1" >
+						<CompareBitmap url="../properties/baselines" target="btn1" numColorVariances="15"
maxColorVariance="1">
 							<ConditionalValue deviceDensity="160" os="win" />
 							<ConditionalValue deviceDensity="240" os="android" />
 							<ConditionalValue deviceDensity="320" os="win" />
@@ -166,7 +166,7 @@
 					</setup>
 					<body>
 						<RunCode code="application.btn1.setStyle('icon', comps.SaveFxgGraphics)" waitEvent="updateComplete"
waitTarget="btn1"/>
-						<CompareBitmap url="../properties/baselines" target="btn1" >
+						<CompareBitmap url="../properties/baselines" target="btn1" numColorVariances="15"
maxColorVariance="1">
 							<ConditionalValue deviceDensity="160" os="win" />
 							<ConditionalValue deviceDensity="240" os="android" />
 							<ConditionalValue deviceDensity="320" os="win" />

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Button/properties/button_properties.mxml
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/properties/button_properties.mxml?rev=1434472&r1=1434471&r2=1434472&view=diff
==============================================================================
--- flex/sdk/branches/develop/mustella/tests/mobile/components/Button/properties/button_properties.mxml
(original)
+++ flex/sdk/branches/develop/mustella/tests/mobile/components/Button/properties/button_properties.mxml
Wed Jan 16 23:08:56 2013
@@ -915,7 +915,7 @@
 								<SetProperty propertyName="rotationX" value="45" target="propertiesRoot.button2"
waitEvent="updateComplete" waitTarget="propertiesRoot.button2"/>
             </setup>
             <body>
-                <CompareBitmap url="../properties/baselines" target="propertiesRoot.grp1">
+                <CompareBitmap url="../properties/baselines" target="propertiesRoot.grp1"
numColorVariances="2" maxColorVariance="1">
 					<ConditionalValue deviceDensity="160" os="win" />
 					<ConditionalValue deviceDensity="240" os="android" />
 					<ConditionalValue deviceDensity="320" os="win" />
@@ -932,7 +932,7 @@
 								<SetProperty propertyName="rotationY" value="-45" target="propertiesRoot.button2"
waitEvent="updateComplete" waitTarget="propertiesRoot.button2"/>
             </setup>
             <body>
-                <CompareBitmap url="../properties/baselines" target="propertiesRoot.grp1">
+                <CompareBitmap url="../properties/baselines" target="propertiesRoot.grp1"
numColorVariances="2" maxColorVariance="1">
 					<ConditionalValue deviceDensity="160" os="win" />
 					<ConditionalValue deviceDensity="240" os="android" />
 					<ConditionalValue deviceDensity="320" os="win" />

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/Mobile_Button_styles_fontFamily_CourierNew@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/Mobile_Button_styles_fontFamily_CourierNew%40android_240ppi.png?rev=1434472&r1=1434471&r2=1434472&view=diff
==============================================================================
Binary files - no diff available.

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/Mobile_Button_styles_fontFamily_CourierNew_setStyle@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/Mobile_Button_styles_fontFamily_CourierNew_setStyle%40android_240ppi.png?rev=1434472&r1=1434471&r2=1434472&view=diff
==============================================================================
Binary files - no diff available.

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/Mobile_Button_styles_fontSetting_disabled@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/Mobile_Button_styles_fontSetting_disabled%40android_240ppi.png?rev=1434472&r1=1434471&r2=1434472&view=diff
==============================================================================
Binary files - no diff available.

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/Mobile_Button_styles_fontSetting_selected@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/Mobile_Button_styles_fontSetting_selected%40android_240ppi.png?rev=1434472&r1=1434471&r2=1434472&view=diff
==============================================================================
Binary files - no diff available.

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/Mobile_Button_styles_font_styleName@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/Mobile_Button_styles_font_styleName%40android_240ppi.png?rev=1434472&r1=1434471&r2=1434472&view=diff
==============================================================================
Binary files - no diff available.

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/button_styles.mxml
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/button_styles.mxml?rev=1434472&r1=1434471&r2=1434472&view=diff
==============================================================================
--- flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/button_styles.mxml
(original)
+++ flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/button_styles.mxml
Wed Jan 16 23:08:56 2013
@@ -35,7 +35,7 @@
 			}
 
 			.fontStyle {
-				fontFamily: 'Courier New';
+				fontFamily: 'MyFixedHalo';
 				fontSize: 18;
 				fontWeight: bold;
 			}			
@@ -673,10 +673,10 @@
 	<setup>
 		<ResetComponent target="stylesRoot.b_skin_normal" className="spark.components.Button"
waitEvent="updateComplete" />
 		<SetProperty target="stylesRoot.b_skin_normal" propertyName="label" value="Font Testing"
waitEvent="contentChange" />
-		<SetStyle target="stylesRoot.b_skin_normal" styleName="fontFamily" value="Courier New"
waitEvent="updateComplete" />
+		<SetStyle target="stylesRoot.b_skin_normal" styleName="fontFamily" value="MyFixedHalo"
waitEvent="updateComplete" />
 	</setup>
 	<body>
-		<AssertStyleValue target="stylesRoot.b_skin_normal" styleName="fontFamily" value="Courier
New" />
+		<AssertStyleValue target="stylesRoot.b_skin_normal" styleName="fontFamily" value="MyFixedHalo"
/>
 		<CompareBitmap url="../styles/baselines" target="stylesRoot.b_skin_normal" >
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
@@ -693,8 +693,8 @@
 		<SetProperty target="stylesRoot.b_skin_normal" propertyName="label" value="Font Testing"
waitEvent="contentChange" />
 	</setup>
 	<body>
-		<RunCode code="application.stylesRoot.b_skin_normal.setStyle('fontFamily','Courier New')"
waitTarget="stylesRoot.b_skin_normal" waitEvent="updateComplete"/>
-		<AssertStyleValue target="stylesRoot.b_skin_normal" styleName="fontFamily" value="Courier
New" />
+		<RunCode code="application.stylesRoot.b_skin_normal.setStyle('fontFamily','MyFixedHalo')"
waitTarget="stylesRoot.b_skin_normal" waitEvent="updateComplete"/>
+		<AssertStyleValue target="stylesRoot.b_skin_normal" styleName="fontFamily" value="MyFixedHalo"
/>
 		<CompareBitmap url="../styles/baselines" target="stylesRoot.b_skin_normal" >
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
@@ -811,7 +811,7 @@
 	</setup>
 	<body>
 		<SetProperty target="stylesRoot.b_skin_normal" propertyName="styleName" value="fontStyle"
waitEvent="updateComplete" />
-		<AssertStyleValue target="stylesRoot.b_skin_normal" styleName="fontFamily" value="Courier
New" />
+		<AssertStyleValue target="stylesRoot.b_skin_normal" styleName="fontFamily" value="MyFixedHalo"
/>
 		<AssertStyleValue target="stylesRoot.b_skin_normal" styleName="fontSize" value="18"
/>
 		<AssertStyleValue target="stylesRoot.b_skin_normal" styleName="fontWeight" value="bold"
/>
 		<CompareBitmap url="../styles/baselines" target="stylesRoot.b_skin_normal" >
@@ -891,7 +891,7 @@
 		<DispatchMouseEvent target="stylesRoot.b_skin_normal" type="rollOver" localX="27" localY="16"
waitEvent="rollOver" />
 		<DispatchMouseEvent target="stylesRoot.b_skin_normal" type="mouseMove" localX="27" localY="16"
waitEvent="mouseMove" />
 		<DispatchMouseEvent target="stylesRoot.b_skin_normal" type="mouseDown" localX="27" localY="16"
waitEvent="mouseDown" />
-		<AssertStyleValue target="stylesRoot.b_skin_normal" styleName="fontFamily" value="Courier
New" />
+		<AssertStyleValue target="stylesRoot.b_skin_normal" styleName="fontFamily" value="MyFixedHalo"
/>
 		<AssertStyleValue target="stylesRoot.b_skin_normal" styleName="fontSize" value="18"
/>
 		<AssertStyleValue target="stylesRoot.b_skin_normal" styleName="fontWeight" value="bold"
/>
 		<CompareBitmap url="../styles/baselines" target="stylesRoot.b_skin_normal" >
@@ -913,7 +913,7 @@
 		<SetProperty target="stylesRoot.b_skin_normal" propertyName="styleName" value="fontStyle"
waitEvent="updateComplete" />
 	</setup>
 	<body>
-		<AssertStyleValue target="stylesRoot.b_skin_normal" styleName="fontFamily" value="Courier
New" />
+		<AssertStyleValue target="stylesRoot.b_skin_normal" styleName="fontFamily" value="MyFixedHalo"
/>
 		<AssertStyleValue target="stylesRoot.b_skin_normal" styleName="fontSize" value="18"
/>
 		<AssertStyleValue target="stylesRoot.b_skin_normal" styleName="fontWeight" value="bold"
/>
 		<CompareBitmap url="../styles/baselines" target="stylesRoot.b_skin_normal" >

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Button/swfs/MobileButtonMain.mxml
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/swfs/MobileButtonMain.mxml?rev=1434472&r1=1434471&r2=1434472&view=diff
==============================================================================
--- flex/sdk/branches/develop/mustella/tests/mobile/components/Button/swfs/MobileButtonMain.mxml
(original)
+++ flex/sdk/branches/develop/mustella/tests/mobile/components/Button/swfs/MobileButtonMain.mxml
Wed Jan 16 23:08:56 2013
@@ -23,6 +23,35 @@
 			  xmlns:comps="comps.*">
 
 	<fx:Style source="../../../../../Assets/Fonts/MobileFontStyles.css" />
+		<fx:Style>
+		@font-face {
+			src: url("../../../../../Assets/Fonts/Cousine/Cousine-Regular.ttf");
+			fontFamily: "MyFixedHalo";
+			embedAsCFF: false;
+		}
+		
+		@font-face {
+			src: url("../../../../../Assets/Fonts/Cousine/Cousine-Bold.ttf");
+			fontFamily: "MyFixedHalo";
+			fontWeight: bold;
+			embedAsCFF: false;
+		}
+		
+		@font-face {
+			src: url("../../../../../Assets/Fonts/Cousine/Cousine-Italic.ttf");
+			fontFamily: "MyFixedHalo";
+			fontStyle: italic;
+			embedAsCFF: false;
+		}
+		
+		@font-face {
+			src: url("../../../../../Assets/Fonts/Cousine/Cousine-BoldItalic.ttf");
+			fontFamily: "MyFixedHalo";
+			fontWeight: bold;
+			fontStyle: italic;
+			embedAsCFF: false;
+		}		
+	</fx:Style>
 	<s:layout>
 		<s:VerticalLayout gap="40" />
 	</s:layout>



Mime
View raw message