You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/10/22 00:37:27 UTC

[35/50] git commit: [flex-sdk] [refs/heads/master] - Test didn't have embedded fonts

Test didn't have embedded fonts


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

Branch: refs/heads/master
Commit: d2ccdc143a869988afeea1d3b1b443901f65d2b2
Parents: 35706c9
Author: Alex Harui <ah...@apache.org>
Authored: Sun Oct 13 21:07:23 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Oct 13 21:07:23 2013 -0700

----------------------------------------------------------------------
 .../SWFs/AdvancedDataGridMain_FLEX_32848.mxml   |  54 ++++++++++++++++++-
 .../datagrid_textSelectedColor_singleCell.png   | Bin 8961 -> 11609 bytes
 .../datagrid_textSelectedColor_singleRow.png    | Bin 5858 -> 7133 bytes
 3 files changed, 53 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d2ccdc14/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridMain_FLEX_32848.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridMain_FLEX_32848.mxml b/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridMain_FLEX_32848.mxml
index ad71bc1..082ec37 100644
--- a/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridMain_FLEX_32848.mxml
+++ b/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridMain_FLEX_32848.mxml
@@ -35,7 +35,59 @@
 		</mx:AdvancedDataGrid>
 	</mx:VBox>
 	
-<fx:Style>
+    <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: EmbeddedVerdana;
+        embedAsCFF: false;
+        }
+        
+        @font-face {
+        src: url("../../../../Assets/Fonts/Lobster_Two/LobsterTwo-Bold.ttf");
+        fontFamily: EmbeddedVerdana;
+        fontWeight: bold;
+        fontStyle: normal;
+        embedAsCFF: false;
+        }
+        
+        @font-face {
+        src: url("../../../../Assets/Fonts/Lobster_Two/LobsterTwo-Italic.ttf");
+        fontFamily: EmbeddedVerdana;
+        fontWeight: normal;
+        fontStyle: italic;
+        embedAsCFF: false;
+        }
+        
+        /* Used by some of the styles tests. */
+        @font-face {
+        src: url("../../../../Assets/Fonts/Cousine/Cousine-Regular.ttf");
+        fontFamily: EmbeddedArial;
+        embedAsCFF: false;
+        }
+        
+        @font-face {
+        src: url("../../../../Assets/Fonts/Cousine/Cousine-Bold.ttf");
+        fontFamily: EmbeddedArial;
+        fontWeight: bold;
+        fontStyle: normal;
+        embedAsCFF: false;
+        }
+        
+        mx|AdvancedDataGrid {
+        /* embed the numeric sort indicator */
+        sortFontFamily: EmbeddedVerdana;
+        }
+        
+        global {
+        fontFamily: EmbeddedVerdana;
+        fontAntiAliasType: normal;
+        }
+    </fx:Style>
+
+    <fx:Style>
 	@namespace mx "library://ns.adobe.com/flex/mx";
 	
 	mx|AdvancedDataGrid {

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d2ccdc14/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleCell.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleCell.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleCell.png
index 34f1d69..2c6bf6f 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleCell.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleCell.png differ

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d2ccdc14/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleRow.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleRow.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleRow.png
index f5c627b..3815c0e 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleRow.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textSelectedColor_singleRow.png differ