You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2013/01/17 20:16:23 UTC
svn commit: r1434867 - in
/flex/sdk/branches/develop/mustella/tests/mobile/components:
CheckBox/styles/ CheckBox/styles/baselines/ CheckBox/swfs/
RadioButton/styles/ RadioButton/styles/baselines/ RadioButton/swfs/
Author: aharui
Date: Thu Jan 17 19:16:23 2013
New Revision: 1434867
URL: http://svn.apache.org/viewvc?rev=1434867&view=rev
Log:
More embed font issues
Modified:
flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/baselines/Mobile_checkbox_styles_focusBlendMode_invert@android_240ppi.png
flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/baselines/Mobile_checkbox_styles_focusColor_default@android_240ppi.png
flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/baselines/Mobile_checkbox_styles_fontFamily@android_240ppi.png
flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/baselines/Mobile_checkbox_styles_fontFamily_disabled@android_240ppi.png
flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/checkbox_styles.mxml
flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/swfs/MobileCheckBoxMain.mxml
flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/baselines/Mobile_RadioButton_styles_fontFamily@android_240ppi.png
flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/baselines/Mobile_RadioButton_styles_fontFamily_disabled@android_240ppi.png
flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/radiobutton_styles.mxml
flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/swfs/MobileRadioButtonMain.mxml
Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/baselines/Mobile_checkbox_styles_focusBlendMode_invert@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/baselines/Mobile_checkbox_styles_focusBlendMode_invert%40android_240ppi.png?rev=1434867&r1=1434866&r2=1434867&view=diff
==============================================================================
Binary files - no diff available.
Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/baselines/Mobile_checkbox_styles_focusColor_default@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/baselines/Mobile_checkbox_styles_focusColor_default%40android_240ppi.png?rev=1434867&r1=1434866&r2=1434867&view=diff
==============================================================================
Binary files - no diff available.
Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/baselines/Mobile_checkbox_styles_fontFamily@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/baselines/Mobile_checkbox_styles_fontFamily%40android_240ppi.png?rev=1434867&r1=1434866&r2=1434867&view=diff
==============================================================================
Binary files - no diff available.
Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/baselines/Mobile_checkbox_styles_fontFamily_disabled@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/baselines/Mobile_checkbox_styles_fontFamily_disabled%40android_240ppi.png?rev=1434867&r1=1434866&r2=1434867&view=diff
==============================================================================
Binary files - no diff available.
Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/checkbox_styles.mxml
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/checkbox_styles.mxml?rev=1434867&r1=1434866&r2=1434867&view=diff
==============================================================================
--- flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/checkbox_styles.mxml (original)
+++ flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/checkbox_styles.mxml Thu Jan 17 19:16:23 2013
@@ -497,8 +497,8 @@
</setup>
<body>
<AssertStyleValue target="styleComp.cb1" styleName="fontFamily" value="MyVeraHalo" />
- <SetStyle target="styleComp.cb1" styleName="fontFamily" value="Courier New" waitEvent="updateComplete" />
- <AssertStyleValue target="styleComp.cb1" styleName="fontFamily" value="Courier New" />
+ <SetStyle target="styleComp.cb1" styleName="fontFamily" value="mySerifHalo" waitEvent="updateComplete" />
+ <AssertStyleValue target="styleComp.cb1" styleName="fontFamily" value="mySerifHalo" />
<CompareBitmap url="../styles/baselines" target="styleComp.grp1" >
<ConditionalValue deviceDensity="160" os="win" />
<ConditionalValue deviceDensity="240" os="android" />
@@ -518,8 +518,8 @@
</setup>
<body>
<AssertStyleValue target="styleComp.cb1" styleName="fontFamily" value="MyVeraHalo" />
- <SetStyle target="styleComp.cb1" styleName="fontFamily" value="Courier New" waitEvent="updateComplete" />
- <AssertStyleValue target="styleComp.cb1" styleName="fontFamily" value="Courier New" />
+ <SetStyle target="styleComp.cb1" styleName="fontFamily" value="mySerifHalo" waitEvent="updateComplete" />
+ <AssertStyleValue target="styleComp.cb1" styleName="fontFamily" value="mySerifHalo" />
<CompareBitmap url="../styles/baselines" target="styleComp.grp1" >
<ConditionalValue deviceDensity="160" os="win" />
<ConditionalValue deviceDensity="240" os="android" />
Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/swfs/MobileCheckBoxMain.mxml
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/swfs/MobileCheckBoxMain.mxml?rev=1434867&r1=1434866&r2=1434867&view=diff
==============================================================================
--- flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/swfs/MobileCheckBoxMain.mxml (original)
+++ flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/swfs/MobileCheckBoxMain.mxml Thu Jan 17 19:16:23 2013
@@ -21,6 +21,36 @@
xmlns:s="library://ns.adobe.com/flex/spark" xmlns:comps="comps.*">
<fx:Style source="../../../../../Assets/Fonts/MobileFontStyles.css" />
+ <fx:Style>
+ @namespace s "library://ns.adobe.com/flex/spark";
+ @namespace comps "comps.*";
+
+ @font-face{
+ src: url("../../../../../Assets/Fonts/PT_Serif/PT_Serif-Web-Regular.ttf");
+ fontFamily: mySerifHalo;
+ embedAsCFF: false;
+ }
+ @font-face{
+ src: url("../../../../../Assets/Fonts/PT_Serif/PT_Serif-Web-Italic.ttf");
+ fontFamily: mySerifHalo;
+ fontStyle: italic;
+ embedAsCFF: false;
+ }
+ @font-face{
+ src: url("../../../../../Assets/Fonts/PT_Serif/PT_Serif-Web-Bold.ttf");
+ fontFamily: mySerifHalo;
+ fontWeight: bold;
+ embedAsCFF: false;
+ }
+ @font-face{
+ src: url("../../../../../Assets/Fonts/PT_Serif/PT_Serif-Web-BoldItalic.ttf");
+ fontFamily: mySerifHalo;
+ fontWeight: bold;
+ fontStyle: italic;
+ embedAsCFF: false;
+ }
+ </fx:Style>
+
<s:layout>
<s:VerticalLayout/>
</s:layout>
Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/baselines/Mobile_RadioButton_styles_fontFamily@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/baselines/Mobile_RadioButton_styles_fontFamily%40android_240ppi.png?rev=1434867&r1=1434866&r2=1434867&view=diff
==============================================================================
Binary files - no diff available.
Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/baselines/Mobile_RadioButton_styles_fontFamily_disabled@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/baselines/Mobile_RadioButton_styles_fontFamily_disabled%40android_240ppi.png?rev=1434867&r1=1434866&r2=1434867&view=diff
==============================================================================
Binary files - no diff available.
Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/radiobutton_styles.mxml
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/radiobutton_styles.mxml?rev=1434867&r1=1434866&r2=1434867&view=diff
==============================================================================
--- flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/radiobutton_styles.mxml (original)
+++ flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/radiobutton_styles.mxml Thu Jan 17 19:16:23 2013
@@ -498,8 +498,8 @@
</setup>
<body>
<AssertStyleValue target="styleComp.rb1" styleName="fontFamily" value="MyVeraHalo" />
- <SetStyle target="styleComp.rb1" styleName="fontFamily" value="Courier New" waitEvent="updateComplete" />
- <AssertStyleValue target="styleComp.rb1" styleName="fontFamily" value="Courier New" />
+ <SetStyle target="styleComp.rb1" styleName="fontFamily" value="mySerifHalo" waitEvent="updateComplete" />
+ <AssertStyleValue target="styleComp.rb1" styleName="fontFamily" value="mySerifHalo" />
<CompareBitmap url="../styles/baselines" target="styleComp.grp1" >
<ConditionalValue deviceDensity="160" os="win" />
<ConditionalValue deviceDensity="240" os="android" />
@@ -519,8 +519,8 @@
</setup>
<body>
<AssertStyleValue target="styleComp.rb1" styleName="fontFamily" value="MyVeraHalo" />
- <SetStyle target="styleComp.rb1" styleName="fontFamily" value="Courier New" waitEvent="updateComplete" />
- <AssertStyleValue target="styleComp.rb1" styleName="fontFamily" value="Courier New" />
+ <SetStyle target="styleComp.rb1" styleName="fontFamily" value="mySerifHalo" waitEvent="updateComplete" />
+ <AssertStyleValue target="styleComp.rb1" styleName="fontFamily" value="mySerifHalo" />
<CompareBitmap url="../styles/baselines" target="styleComp.grp1" >
<ConditionalValue deviceDensity="160" os="win" />
<ConditionalValue deviceDensity="240" os="android" />
Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/swfs/MobileRadioButtonMain.mxml
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/swfs/MobileRadioButtonMain.mxml?rev=1434867&r1=1434866&r2=1434867&view=diff
==============================================================================
--- flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/swfs/MobileRadioButtonMain.mxml (original)
+++ flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/swfs/MobileRadioButtonMain.mxml Thu Jan 17 19:16:23 2013
@@ -21,6 +21,35 @@
xmlns:s="library://ns.adobe.com/flex/spark" xmlns:comps="comps.*">
<fx:Style source="../../../../../Assets/Fonts/MobileFontStyles.css" />
+ <fx:Style>
+ @namespace s "library://ns.adobe.com/flex/spark";
+ @namespace comps "comps.*";
+
+ @font-face{
+ src: url("../../../../../Assets/Fonts/PT_Serif/PT_Serif-Web-Regular.ttf");
+ fontFamily: mySerifHalo;
+ embedAsCFF: false;
+ }
+ @font-face{
+ src: url("../../../../../Assets/Fonts/PT_Serif/PT_Serif-Web-Italic.ttf");
+ fontFamily: mySerifHalo;
+ fontStyle: italic;
+ embedAsCFF: false;
+ }
+ @font-face{
+ src: url("../../../../../Assets/Fonts/PT_Serif/PT_Serif-Web-Bold.ttf");
+ fontFamily: mySerifHalo;
+ fontWeight: bold;
+ embedAsCFF: false;
+ }
+ @font-face{
+ src: url("../../../../../Assets/Fonts/PT_Serif/PT_Serif-Web-BoldItalic.ttf");
+ fontFamily: mySerifHalo;
+ fontWeight: bold;
+ fontStyle: italic;
+ embedAsCFF: false;
+ }
+ </fx:Style>
<s:layout>
<s:VerticalLayout/>
</s:layout>