Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 23F09E94D for ; Wed, 16 Jan 2013 23:09:22 +0000 (UTC) Received: (qmail 73990 invoked by uid 500); 16 Jan 2013 23:09:22 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 73938 invoked by uid 500); 16 Jan 2013 23:09:21 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 73931 invoked by uid 99); 16 Jan 2013 23:09:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Jan 2013 23:09:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Jan 2013 23:09:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9334B23888CD; Wed, 16 Jan 2013 23:08:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@flex.apache.org From: aharui@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130116230857.9334B23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ - + @@ -166,7 +166,7 @@ - + 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 @@ - + @@ -932,7 +932,7 @@ - + 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 @@ - + - + @@ -693,8 +693,8 @@ - - + + @@ -811,7 +811,7 @@ - + @@ -891,7 +891,7 @@ - + @@ -913,7 +913,7 @@ - + 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.*"> + + @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; + } +