flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject git commit: [flex-asjs] [refs/heads/develop] - Removing getters for Label and Button to allow view beads to determine size.
Date Tue, 10 Jun 2014 15:20:15 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop d2f9ce253 -> bdce67f09


Removing getters for Label and Button to allow view beads to determine size.


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

Branch: refs/heads/develop
Commit: bdce67f09d037561d048a7776b39e0121ab1fc39
Parents: d2f9ce2
Author: Peter Ent <pent@apache.org>
Authored: Tue Jun 10 11:20:00 2014 -0400
Committer: Peter Ent <pent@apache.org>
Committed: Tue Jun 10 11:20:00 2014 -0400

----------------------------------------------------------------------
 .../FlexJSUI/src/org/apache/flex/html/Button.as | 46 --------------------
 .../FlexJSUI/src/org/apache/flex/html/Label.as  | 24 ----------
 2 files changed, 70 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce67f0/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Button.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Button.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Button.as
index b9e0ede..61dfc76 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Button.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Button.as
@@ -70,52 +70,6 @@ package org.apache.flex.html
 		public function Button()
 		{
 			super();
-		}	
-		
-		/**
-		 * @private
-		 */
-		override public function get width():Number
-		{
-			var useWidth:Number;
-			if (isNaN(this.explicitWidth)) {
-				var padding:Object = ValuesManager.valuesImpl.getValue(this,"padding");
-				if (padding == null) padding = 0;
-				var borderThickness:Object = ValuesManager.valuesImpl.getValue(this,"border-thickness");
-				if (borderThickness == null) borderThickness = 0;
-				var paddingLeft:Object = ValuesManager.valuesImpl.getValue(this,"padding-left");
-				if (paddingLeft == null) paddingLeft = padding;
-				var paddingRight:Object = ValuesManager.valuesImpl.getValue(this,"padding-right");
-				if (paddingRight == null) paddingRight = padding;
-				useWidth = super.width + paddingLeft + paddingRight + 2*Number(borderThickness);
-			}
-			else {
-				useWidth = this.explicitWidth;
-			}
-			return useWidth;
-		}
-		
-		/**
-		 * @private
-		 */
-		override public function get height():Number
-		{
-			var useHeight:Number;
-			if (isNaN(this.explicitHeight)) {
-				var padding:Object = ValuesManager.valuesImpl.getValue(this,"padding");
-				if (padding == null) padding = 0;
-				var borderThickness:Object = ValuesManager.valuesImpl.getValue(this,"border-thickness");
-				if (borderThickness == null) borderThickness = 0;
-				var paddingTop:Object = ValuesManager.valuesImpl.getValue(this,"padding-top");
-				if (paddingTop == null) paddingTop = padding;
-				var paddingBottom:Object = ValuesManager.valuesImpl.getValue(this,"padding-bottom");
-				if (paddingBottom == null) paddingBottom = padding;
-				useHeight = super.height + paddingTop + paddingBottom + 2*Number(borderThickness);
-			}
-			else {
-				useHeight = this.explicitHeight;
-			}
-			return useHeight;
 		}
 	}
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce67f0/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Label.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Label.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Label.as
index 9ed74a2..71ea3d5 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Label.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/Label.as
@@ -115,29 +115,5 @@ package org.apache.flex.html
 			super.height = value;
 			IEventDispatcher(model).dispatchEvent( new Event("heightChanged") );
 		}
-		
-		/**
-		 *  @private
-		 *  Override height to provide top and bottom padding.
-		 */
-		override public function get height():Number
-		{
-			var useHeight:Number;
-			if (isNaN(this.explicitHeight)) {
-				var padding:Object = ValuesManager.valuesImpl.getValue(this,"padding");
-				if (padding == null) padding = 0;
-				var borderThickness:Object = ValuesManager.valuesImpl.getValue(this,"border-thickness");
-				if (borderThickness == null) borderThickness = 0;
-				var paddingTop:Object = ValuesManager.valuesImpl.getValue(this,"padding-top");
-				if (paddingTop == null) paddingTop = padding;
-				var paddingBottom:Object = ValuesManager.valuesImpl.getValue(this,"padding-bottom");
-				if (paddingBottom == null) paddingBottom = padding;
-				useHeight = super.height + paddingTop + paddingBottom + 2*Number(borderThickness);
-			}
-			else {
-				useHeight = this.explicitHeight;
-			}
-			return useHeight;
-		}
 	}
 }


Mime
View raw message