You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cf...@apache.org on 2012/09/07 17:28:15 UTC

svn commit: r1382067 - in /incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput: Properties/ Properties/baselines/ swfs/

Author: cframpton
Date: Fri Sep  7 15:28:14 2012
New Revision: 1382067

URL: http://svn.apache.org/viewvc?rev=1382067&view=rev
Log:
Use embedded fonts.

Modified:
    incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_bindable_tester.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/Properties/baselines/TextInput_prompt_property_bindable@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/swfs/Flex45_TextInput_bugs.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/swfs/Flex4_TextInput_bindable.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/swfs/TextInput_component_Bound.mxml

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_bindable_tester.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_bindable_tester.mxml?rev=1382067&r1=1382066&r2=1382067&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_bindable_tester.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_bindable_tester.mxml Fri Sep  7 15:28:14 2012
@@ -160,6 +160,7 @@
 			</setup>
 			<body>
 				<SetProperty target="textInput3" propertyName="text" value="jello world" waitEvent="updateComplete" waitTarget="textInput3"/>
+				<WaitForLayoutManager/>
 				<AssertPropertyValue target="textInput2" propertyName="prompt" value="jello world" />
 				<CompareBitmap url="../Properties/baselines/" target="textInput2">
 				<ConditionalValue os="mac"/>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/Properties/baselines/TextInput_prompt_property_bindable@mac.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/Properties/baselines/TextInput_prompt_property_bindable%40mac.png?rev=1382067&r1=1382066&r2=1382067&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/swfs/Flex45_TextInput_bugs.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/swfs/Flex45_TextInput_bugs.mxml?rev=1382067&r1=1382066&r2=1382067&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/swfs/Flex45_TextInput_bugs.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/swfs/Flex45_TextInput_bugs.mxml Fri Sep  7 15:28:14 2012
@@ -21,6 +21,35 @@
 			   xmlns:s="library://ns.adobe.com/flex/spark"
 			   xmlns:mx="library://ns.adobe.com/flex/mx">
 	
+	<fx:Style>
+		@namespace s "library://ns.adobe.com/flex/spark";
+		@namespace mx "library://ns.adobe.com/flex/mx";
+
+		@font-face{
+			src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Regular.ttf");
+			fontFamily: ArialSpark;
+			embedAsCFF: true;
+		}
+
+		@font-face{
+			src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Bold.ttf");
+			fontWeight: bold;
+			fontFamily: ArialSpark;
+			embedAsCFF: true;
+		}
+
+		@font-face{
+			src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Italic.ttf");
+			fontStyle: italic;
+			fontFamily: ArialSpark;
+			embedAsCFF: true;
+		}
+		
+		.global{
+		    fontFamily: ArialSpark;
+            fontAntiAliasType: "normal";
+        }
+	</fx:Style>
 
 	
 	<s:VGroup x="20" y="20">

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/swfs/Flex4_TextInput_bindable.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/swfs/Flex4_TextInput_bindable.mxml?rev=1382067&r1=1382066&r2=1382067&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/swfs/Flex4_TextInput_bindable.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/swfs/Flex4_TextInput_bindable.mxml Fri Sep  7 15:28:14 2012
@@ -31,7 +31,32 @@
 	<fx:Style>
 		@namespace s "library://ns.adobe.com/flex/spark";
 		@namespace mx "library://ns.adobe.com/flex/mx";
+
+		@font-face{
+			src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Regular.ttf");
+			fontFamily: ArialSpark;
+			embedAsCFF: true;
+		}
+
+		@font-face{
+			src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Bold.ttf");
+			fontWeight: bold;
+			fontFamily: ArialSpark;
+			embedAsCFF: true;
+		}
+
+		@font-face{
+			src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Italic.ttf");
+			fontStyle: italic;
+			fontFamily: ArialSpark;
+			embedAsCFF: true;
+		}
 		
+		.global{
+		    fontFamily: ArialSpark;
+            fontAntiAliasType: "normal";
+        }
+
 		s|SkinnableTextBase:normalWithPrompt {
 			color: haloOrange;
 		}
@@ -39,7 +64,7 @@
 
 	<fx:Script>
 		<![CDATA[
-import spark.components.TextInput;
+            import spark.components.TextInput;
 			import mx.managers.ToolTipManager;
 
 			private function init():void {

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/swfs/TextInput_component_Bound.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/swfs/TextInput_component_Bound.mxml?rev=1382067&r1=1382066&r2=1382067&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/swfs/TextInput_component_Bound.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/TextInput/swfs/TextInput_component_Bound.mxml Fri Sep  7 15:28:14 2012
@@ -23,5 +23,36 @@
 	<fx:Declarations>
 		<!-- Place non-visual elements (e.g., services, value objects) here -->
 	</fx:Declarations>
+
+	<fx:Style>
+		@namespace s "library://ns.adobe.com/flex/spark";
+		@namespace mx "library://ns.adobe.com/flex/mx";
+
+		@font-face{
+			src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Regular.ttf");
+			fontFamily: ArialSpark;
+			embedAsCFF: true;
+		}
+
+		@font-face{
+			src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Bold.ttf");
+			fontWeight: bold;
+			fontFamily: ArialSpark;
+			embedAsCFF: true;
+		}
+
+		@font-face{
+			src: url("../../../../../Assets/Fonts/Open_Sans/OpenSans-Italic.ttf");
+			fontStyle: italic;
+			fontFamily: ArialSpark;
+			embedAsCFF: true;
+		}
+		
+		.global{
+		    fontFamily: ArialSpark;
+            fontAntiAliasType: "normal";
+        }
+	</fx:Style>
+
 	<comps1:MyCustomTextInput id="myCustomTextInput1"/>
 </s:Application>
\ No newline at end of file