flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mkess...@apache.org
Subject git commit: [flex-sdk] [refs/heads/develop] - FLEX-33984: Added a default labelPlacement when no style is present.
Date Tue, 10 Dec 2013 00:15:29 GMT
Updated Branches:
  refs/heads/develop 27be89a05 -> dfa2f1c6c


FLEX-33984: Added a default labelPlacement when no style is present.


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

Branch: refs/heads/develop
Commit: dfa2f1c6c379caf13e52f382d274de7ff0c63102
Parents: 27be89a
Author: Mark Kessler <KesslerConsulting@gmail.com>
Authored: Mon Dec 9 19:13:19 2013 -0500
Committer: Mark Kessler <KesslerConsulting@gmail.com>
Committed: Mon Dec 9 19:13:19 2013 -0500

----------------------------------------------------------------------
 .../src/spark/skins/spark/CheckBoxSkin.mxml     | 60 ++++++++++++--------
 1 file changed, 36 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dfa2f1c6/frameworks/projects/spark/src/spark/skins/spark/CheckBoxSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/skins/spark/CheckBoxSkin.mxml b/frameworks/projects/spark/src/spark/skins/spark/CheckBoxSkin.mxml
index f4ad944..83d176c 100644
--- a/frameworks/projects/spark/src/spark/skins/spark/CheckBoxSkin.mxml
+++ b/frameworks/projects/spark/src/spark/skins/spark/CheckBoxSkin.mxml
@@ -117,7 +117,8 @@
             //--------------------------------------------------------------------------
 
             /**
-             *  Sets the label placement in relation to the checkbox. 
+             *  Sets the label placement in relation to the checkbox.
+             *  Requires the SkinParts <code>checkDisplay</code> and <code>labelDisplay</code>.
 
              *
              *  @langversion 3.0
              *  @playerversion Flash 11.8
@@ -126,11 +127,25 @@
              */
             public function updateLabelPlacement():void
             {
+                var spacing:int;
+
+
                 if (!checkDisplay || !labelDisplay)
                 {
                     return;
                 }
 
+                if (getStyle("gap") == undefined)
+                {
+                    //Add a default gap if the gap style is undefined.
+                    spacing = 5;
+                }
+                else
+                {
+                    spacing = int(getStyle("gap"));
+                }
+
+
                 switch (String(getStyle("labelPlacement")).toLowerCase())
                 {
                     case LabelPlacement.BOTTOM:
@@ -138,7 +153,7 @@
                         //Adjust the labels position to the bottom.
                         labelDisplay.horizontalCenter = 0;
                         labelDisplay.verticalCenter = undefined;
-                        labelDisplay.top = checkDisplay.height + int(getStyle("gap"));
+                        labelDisplay.top = checkDisplay.height + spacing;
                         labelDisplay.bottom = undefined;
                         labelDisplay.left = undefined;
                         labelDisplay.right = undefined;
@@ -160,7 +175,7 @@
                         labelDisplay.top = undefined;
                         labelDisplay.bottom = undefined;
                         labelDisplay.left = undefined;
-                        labelDisplay.right = checkDisplay.width + int(getStyle("gap"));
+                        labelDisplay.right = checkDisplay.width + spacing;
 
                         //Adjust the checkboxes position to right side.
                         checkDisplay.horizontalCenter = undefined;
@@ -171,32 +186,13 @@
                         break;
                     }
 
-                    case LabelPlacement.RIGHT:
-                    {
-                        //Adjust the labels position to right side.
-                        labelDisplay.horizontalCenter = undefined;
-                        labelDisplay.verticalCenter = 2;
-                        labelDisplay.top = undefined;
-                        labelDisplay.bottom = undefined;
-                        labelDisplay.left = checkDisplay.width + int(getStyle("gap"));
-                        labelDisplay.right = undefined;
-
-                        //Adjust the checkboxes position to left side.
-                        checkDisplay.horizontalCenter = undefined;
-                        checkDisplay.verticalCenter = 0;
-                        checkDisplay.left = 0;
-                        checkDisplay.right = undefined;
-
-                        break;
-                    }
-
                     case LabelPlacement.TOP:
                     {
                         //Adjust the labels position to the top.
                         labelDisplay.horizontalCenter = 0;
                         labelDisplay.verticalCenter = undefined;
                         labelDisplay.top = undefined;
-                        labelDisplay.bottom = checkDisplay.height + int(getStyle("gap"));
+                        labelDisplay.bottom = checkDisplay.height + spacing;
                         labelDisplay.left = undefined;
                         labelDisplay.right = undefined;
 
@@ -209,8 +205,24 @@
                         break;
                     }
 
+                    //Making the rightside labelPlacement the default.
+                    case LabelPlacement.RIGHT:
                     default:
                     {
+                        //Adjust the labels position to right side.
+                        labelDisplay.horizontalCenter = undefined;
+                        labelDisplay.verticalCenter = 2;
+                        labelDisplay.top = undefined;
+                        labelDisplay.bottom = undefined;
+                        labelDisplay.left = checkDisplay.width + spacing;
+                        labelDisplay.right = undefined;
+
+                        //Adjust the checkboxes position to left side.
+                        checkDisplay.horizontalCenter = undefined;
+                        checkDisplay.verticalCenter = 0;
+                        checkDisplay.left = 0;
+                        checkDisplay.right = undefined;
+
                         break;
                     }
                 }
@@ -231,7 +243,7 @@
     </s:states>
     
     <!-- Checkbox container -->
-	<!--- Group that houses the CheckBox and check -->
+    <!--- Group that houses the CheckBox and check -->
     <s:Group id="checkDisplay" verticalCenter="0" width="13" height="13" layoutDirection="ltr">
         <!-- drop shadow -->
         <s:Rect left="-1" top="-1" right="-1" bottom="-1">


Mime
View raw message