flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject [2/4] git commit: [flex-sdk] [refs/heads/release4.11.0] - partly fix failing SplitNavigatorView mustella tests 5 out of 6 fails are fixed. The remaining fail is due to incorrect Callout skin implementation: see https://issues.apache.org/jira/browse/FLEX-
Date Thu, 10 Oct 2013 22:25:51 GMT
partly fix failing SplitNavigatorView mustella tests
5 out of 6 fails are fixed.
The remaining fail is due to incorrect Callout skin implementation:
see https://issues.apache.org/jira/browse/FLEX-33809


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

Branch: refs/heads/release4.11.0
Commit: 03132154c0d39cf296cbbee042741a8e609aa8c2
Parents: 10ff6e4
Author: mamsellem <maurice.amsellem@systar.com>
Authored: Thu Oct 10 12:21:18 2013 +0200
Committer: mamsellem <maurice.amsellem@systar.com>
Committed: Thu Oct 10 12:21:18 2013 +0200

----------------------------------------------------------------------
 frameworks/projects/mobiletheme/defaults.css         |  2 ++
 .../src/spark/skins/mobile/CalloutSkin.as            |  2 +-
 .../skins/mobile/supportClasses/CalloutArrow.as      |  9 +++++++++
 .../spark/src/spark/skins/spark/CalloutSkin.as       | 15 +--------------
 .../SplitViewNavigator/swfs/skins/MyCalloutSkin.as   |  4 ++--
 5 files changed, 15 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/03132154/frameworks/projects/mobiletheme/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/defaults.css b/frameworks/projects/mobiletheme/defaults.css
index d47035c..850b296 100644
--- a/frameworks/projects/mobiletheme/defaults.css
+++ b/frameworks/projects/mobiletheme/defaults.css
@@ -132,6 +132,8 @@ Callout
     contentBackgroundColor: #FFFFFF;
     gap: 12;
     skinClass: ClassReference("spark.skins.mobile.CalloutSkin");
+    borderThickness: NaN;
+    borderColor: 0;
 }
 
 Callout ViewNavigator

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/03132154/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutSkin.as
index 364327d..1a6df7d 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutSkin.as
@@ -576,7 +576,7 @@ public class CalloutSkin extends MobileSkin
         var frameEllipseSize:Number = backgroundCornerRadius * 2;
         
         // account for borderThickness center stroke alignment
-        var showBorder:Boolean = !isNaN(borderThickness);
+        var showBorder:Boolean = !isNaN(borderThickness) || borderThickness > 0 ;
         var borderWeight:Number = showBorder ? borderThickness : 0;
         
         // contentBackgroundGraphic already accounts for the arrow position

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/03132154/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/CalloutArrow.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/CalloutArrow.as
b/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/CalloutArrow.as
index ac8823d..553eb21 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/CalloutArrow.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/supportClasses/CalloutArrow.as
@@ -146,6 +146,15 @@ public class CalloutArrow extends UIComponent
      */
     protected var useBackgroundGradient:Boolean;
     
+    /**
+     *  @copy spark.skins.mobile.CalloutSkin#borderColor
+     */
+    protected var borderColor:Number;
+
+    /**
+     *  @copy spark.skins.mobile.CalloutSkin#borderThickness
+     */
+    protected var borderThickness:Number = NaN;
 
     /**
      *  @private

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/03132154/frameworks/projects/spark/src/spark/skins/spark/CalloutSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/skins/spark/CalloutSkin.as b/frameworks/projects/spark/src/spark/skins/spark/CalloutSkin.as
index 972f464..6d4f91d 100644
--- a/frameworks/projects/spark/src/spark/skins/spark/CalloutSkin.as
+++ b/frameworks/projects/spark/src/spark/skins/spark/CalloutSkin.as
@@ -93,7 +93,7 @@ public class CalloutSkin extends ActionScriptSkinBase
         
         dropShadowAlpha = 0.7;
 
-                // default DPI_160
+                // default DPI_120
         backgroundCornerRadius = 6;
         contentBackgroundInsetClass = CalloutContentBackground;
         backgroundGradientHeight = 83;
@@ -106,19 +106,6 @@ public class CalloutSkin extends ActionScriptSkinBase
         dropShadowDistance = 2;
         highlightWeight = 0.5;
 
-         /*
-                backgroundCornerRadius = 8;
-                contentBackgroundInsetClass = CalloutContentBackground;
-                backgroundGradientHeight = 110;
-                frameThickness = 6;
-                arrowWidth = 26;
-                arrowHeight = 13;
-                contentCornerRadius = 5;
-                dropShadowBlurX = 16;
-                dropShadowBlurY = 16;
-                dropShadowDistance = 3;
-                highlightWeight = 1;
-          */
     }
     
     //--------------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/03132154/mustella/tests/mobile/SplitViewNavigator/swfs/skins/MyCalloutSkin.as
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/SplitViewNavigator/swfs/skins/MyCalloutSkin.as b/mustella/tests/mobile/SplitViewNavigator/swfs/skins/MyCalloutSkin.as
index 8cc94eb..b49e03e 100644
--- a/mustella/tests/mobile/SplitViewNavigator/swfs/skins/MyCalloutSkin.as
+++ b/mustella/tests/mobile/SplitViewNavigator/swfs/skins/MyCalloutSkin.as
@@ -29,8 +29,8 @@ package skins
 			frameThickness=10;
 			arrowWidth = 50;
 			arrowHeight = 50;
-			borderThickness = 10;
-			borderColor = 0xFF0000;
+			setStyle('borderThickness' , 10);
+			setStyle('borderColor', 0xFF0000);
 			dropShadowVisible=true;
 			backgroundCornerRadius=30;
 			


Mime
View raw message