This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 367add1 jewel-layouts: remove unused paddings
367add1 is described below
commit 367add1e400142d48df1a2b266f8622bc504abf9
Author: Carlos Rovira <[email protected]>
AuthorDate: Fri Feb 21 19:55:16 2020 +0100
jewel-layouts: remove unused paddings
---
.../royale/jewel/beads/layouts/GridCellLayout.as | 6 +-
.../beads/layouts/HorizontalCenteredLayout.as | 124 ++-------------------
.../jewel/beads/layouts/HorizontalFlowLayout.as | 124 ++-------------------
.../royale/jewel/beads/layouts/HorizontalLayout.as | 120 ++------------------
.../royale/jewel/beads/layouts/TileLayout.as | 108 +-----------------
.../jewel/beads/layouts/VerticalCenteredLayout.as | 124 ++-------------------
.../jewel/beads/layouts/VerticalFlowLayout.as | 124 ++-------------------
.../royale/jewel/beads/layouts/VerticalLayout.as | 124 ++-------------------
8 files changed, 62 insertions(+), 792 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridCellLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridCellLayout.as
index 439968a..cb8c852 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridCellLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/GridCellLayout.as
@@ -18,12 +18,11 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel.beads.layouts
{
- COMPILE::JS {
- import org.apache.royale.core.UIBase;
- }
+ COMPILE::SWF {
import org.apache.royale.core.ILayoutChild;
import org.apache.royale.core.ILayoutView;
import org.apache.royale.core.IUIBase;
+ }
import org.apache.royale.events.Event;
import org.apache.royale.jewel.beads.layouts.StyledLayoutBase;
@@ -498,7 +497,6 @@ package org.apache.royale.jewel.beads.layouts
/**
* @copy org.apache.royale.core.IBeadLayout#layout
- * @royaleignorecoercion org.apache.royale.core.UIBase
*/
override public function layout():Boolean
{
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalCenteredLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalCenteredLayout.as
index da47137..a676589 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalCenteredLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalCenteredLayout.as
@@ -88,110 +88,6 @@ package org.apache.royale.jewel.beads.layouts
}
}
- /**
- * @private
- */
- private var _paddingTop:Number = 0;
-
- /**
- * The top padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingTop():Number
- {
- return _paddingTop;
- }
-
- /**
- * @private
- */
- public function set paddingTop(value:Number):void
- {
- _paddingTop = value;
- }
-
- /**
- * @private
- */
- private var _paddingRight:Number = 0;
-
- /**
- * The right padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingRight():Number
- {
- return _paddingRight;
- }
-
- /**
- * @private
- */
- public function set paddingRight(value:Number):void
- {
- _paddingRight = value;
- }
-
- /**
- * @private
- */
- private var _paddingBottom:Number = 0;
-
- /**
- * The top padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingBottom():Number
- {
- return _paddingBottom;
- }
-
- /**
- * @private
- */
- public function set paddingBottom(value:Number):void
- {
- _paddingBottom = value;
- }
-
- /**
- * @private
- */
- private var _paddingLeft:Number = 0;
-
- /**
- * The left padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingLeft():Number
- {
- return _paddingLeft;
- }
-
- /**
- * @private
- */
- public function set paddingLeft(value:Number):void
- {
- _paddingLeft = value;
- }
-
private var gapInitialized:Boolean;
// private var _gap:Boolean;
/**
@@ -344,20 +240,20 @@ package org.apache.royale.jewel.beads.layouts
var data:Object;
var canAdjust:Boolean = false;
- var paddingMetrics:EdgeData = new EdgeData();
- paddingMetrics.left = _paddingLeft;
- paddingMetrics.top = _paddingTop;
- paddingMetrics.right = _paddingRight;
- paddingMetrics.bottom = _paddingBottom;
- var borderMetrics:EdgeData =
(ValuesManager.valuesImpl as
IBorderPaddingMarginValuesImpl).getBorderMetrics(host);
+ // var paddingMetrics:EdgeData = new EdgeData();
+ // paddingMetrics.left = _paddingLeft;
+ // paddingMetrics.top = _paddingTop;
+ // paddingMetrics.right = _paddingRight;
+ // paddingMetrics.bottom = _paddingBottom;
+ // var borderMetrics:EdgeData =
(ValuesManager.valuesImpl as
IBorderPaddingMarginValuesImpl).getBorderMetrics(host);
// adjust the host's usable size by the
metrics. If hostSizedToContent, then the
// resulting adjusted value may be less than
zero.
- hostWidth -= paddingMetrics.left +
paddingMetrics.right + borderMetrics.left + borderMetrics.right;
- hostHeight -= paddingMetrics.top +
paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
+ // hostWidth -= paddingMetrics.left +
paddingMetrics.right + borderMetrics.left + borderMetrics.right;
+ // hostHeight -= paddingMetrics.top +
paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
- var xpos:Number = borderMetrics.left +
paddingMetrics.left;
- var ypos:Number = borderMetrics.top +
paddingMetrics.top;
+ var xpos:Number = 0;//borderMetrics.left +
paddingMetrics.left;
+ var ypos:Number = 0;//borderMetrics.top +
paddingMetrics.top;
// First pass determines the data about the
child.
for(var i:int=0; i < n; i++)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalFlowLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalFlowLayout.as
index 52cda82..3afb3e9 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalFlowLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalFlowLayout.as
@@ -88,110 +88,6 @@ package org.apache.royale.jewel.beads.layouts
}
}
- /**
- * @private
- */
- private var _paddingTop:Number = 0;
-
- /**
- * The top padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingTop():Number
- {
- return _paddingTop;
- }
-
- /**
- * @private
- */
- public function set paddingTop(value:Number):void
- {
- _paddingTop = value;
- }
-
- /**
- * @private
- */
- private var _paddingRight:Number = 0;
-
- /**
- * The right padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingRight():Number
- {
- return _paddingRight;
- }
-
- /**
- * @private
- */
- public function set paddingRight(value:Number):void
- {
- _paddingRight = value;
- }
-
- /**
- * @private
- */
- private var _paddingBottom:Number = 0;
-
- /**
- * The top padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingBottom():Number
- {
- return _paddingBottom;
- }
-
- /**
- * @private
- */
- public function set paddingBottom(value:Number):void
- {
- _paddingBottom = value;
- }
-
- /**
- * @private
- */
- private var _paddingLeft:Number = 0;
-
- /**
- * The left padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingLeft():Number
- {
- return _paddingLeft;
- }
-
- /**
- * @private
- */
- public function set paddingLeft(value:Number):void
- {
- _paddingLeft = value;
- }
-
private var gapInitialized:Boolean;
// private var _gap:Boolean;
/**
@@ -344,20 +240,20 @@ package org.apache.royale.jewel.beads.layouts
var data:Object;
var canAdjust:Boolean = false;
- var paddingMetrics:EdgeData = new EdgeData();
- paddingMetrics.left = _paddingLeft;
- paddingMetrics.top = _paddingTop;
- paddingMetrics.right = _paddingRight;
- paddingMetrics.bottom = _paddingBottom;
- var borderMetrics:EdgeData =
(ValuesManager.valuesImpl as
IBorderPaddingMarginValuesImpl).getBorderMetrics(host);
+ // var paddingMetrics:EdgeData = new EdgeData();
+ // paddingMetrics.left = _paddingLeft;
+ // paddingMetrics.top = _paddingTop;
+ // paddingMetrics.right = _paddingRight;
+ // paddingMetrics.bottom = _paddingBottom;
+ // var borderMetrics:EdgeData =
(ValuesManager.valuesImpl as
IBorderPaddingMarginValuesImpl).getBorderMetrics(host);
// adjust the host's usable size by the
metrics. If hostSizedToContent, then the
// resulting adjusted value may be less than
zero.
- hostWidth -= paddingMetrics.left +
paddingMetrics.right + borderMetrics.left + borderMetrics.right;
- hostHeight -= paddingMetrics.top +
paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
+ hostWidth -= paddingMetrics.left;// +
paddingMetrics.right + borderMetrics.left + borderMetrics.right;
+ hostHeight -= paddingMetrics.top;// +
paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
- var xpos:Number = borderMetrics.left +
paddingMetrics.left;
- var ypos:Number = borderMetrics.top +
paddingMetrics.top;
+ var xpos:Number = 0;// borderMetrics.left +
paddingMetrics.left;
+ var ypos:Number = 0;//borderMetrics.top +
paddingMetrics.top;
// First pass determines the data about the
child.
for(var i:int=0; i < n; i++)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as
index 4e19ead..9c4b231 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as
@@ -83,110 +83,6 @@ package org.apache.royale.jewel.beads.layouts
}
}
- /**
- * @private
- */
- private var _paddingTop:Number = 0;
-
- /**
- * The top padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingTop():Number
- {
- return _paddingTop;
- }
-
- /**
- * @private
- */
- public function set paddingTop(value:Number):void
- {
- _paddingTop = value;
- }
-
- /**
- * @private
- */
- private var _paddingRight:Number = 0;
-
- /**
- * The right padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingRight():Number
- {
- return _paddingRight;
- }
-
- /**
- * @private
- */
- public function set paddingRight(value:Number):void
- {
- _paddingRight = value;
- }
-
- /**
- * @private
- */
- private var _paddingBottom:Number = 0;
-
- /**
- * The top padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingBottom():Number
- {
- return _paddingBottom;
- }
-
- /**
- * @private
- */
- public function set paddingBottom(value:Number):void
- {
- _paddingBottom = value;
- }
-
- /**
- * @private
- */
- private var _paddingLeft:Number = 0;
-
- /**
- * The left padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingLeft():Number
- {
- return _paddingLeft;
- }
-
- /**
- * @private
- */
- public function set paddingLeft(value:Number):void
- {
- _paddingLeft = value;
- }
-
private var gapInitialized:Boolean;
// private var _gap:Boolean;
/**
@@ -347,17 +243,17 @@ package org.apache.royale.jewel.beads.layouts
var data:Object;
var canAdjust:Boolean = false;
- var paddingMetrics:EdgeData = new EdgeData();
- paddingMetrics.left = _paddingLeft;
- paddingMetrics.top = _paddingTop;
- paddingMetrics.right = _paddingRight;
- paddingMetrics.bottom = _paddingBottom;
- var borderMetrics:EdgeData =
(ValuesManager.valuesImpl as
IBorderPaddingMarginValuesImpl).getBorderMetrics(host);
+ // var paddingMetrics:EdgeData = new EdgeData();
+ // paddingMetrics.left = _paddingLeft;
+ // paddingMetrics.top = _paddingTop;
+ // paddingMetrics.right = _paddingRight;
+ // paddingMetrics.bottom = _paddingBottom;
+ // var borderMetrics:EdgeData =
(ValuesManager.valuesImpl as
IBorderPaddingMarginValuesImpl).getBorderMetrics(host);
// adjust the host's usable size by the
metrics. If hostSizedToContent, then the
// resulting adjusted value may be less than
zero.
- hostWidth -= paddingMetrics.left +
paddingMetrics.right + borderMetrics.left + borderMetrics.right;
- hostHeight -= paddingMetrics.top +
paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
+ hostWidth -= 0;//paddingMetrics.left +
paddingMetrics.right + borderMetrics.left + borderMetrics.right;
+ hostHeight -= 0;//paddingMetrics.top +
paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
var xpos:Number = borderMetrics.left +
paddingMetrics.left;
var ypos:Number = borderMetrics.top +
paddingMetrics.top;
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileLayout.as
index 7434102..e91378c 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileLayout.as
@@ -119,110 +119,6 @@ package org.apache.royale.jewel.beads.layouts
/**
* @private
*/
- private var _paddingTop:Number = 0;
-
- /**
- * The top padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingTop():Number
- {
- return _paddingTop;
- }
-
- /**
- * @private
- */
- public function set paddingTop(value:Number):void
- {
- _paddingTop = value;
- }
-
- /**
- * @private
- */
- private var _paddingRight:Number = 0;
-
- /**
- * The right padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingRight():Number
- {
- return _paddingRight;
- }
-
- /**
- * @private
- */
- public function set paddingRight(value:Number):void
- {
- _paddingRight = value;
- }
-
- /**
- * @private
- */
- private var _paddingBottom:Number = 0;
-
- /**
- * The top padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingBottom():Number
- {
- return _paddingBottom;
- }
-
- /**
- * @private
- */
- public function set paddingBottom(value:Number):void
- {
- _paddingBottom = value;
- }
-
- /**
- * @private
- */
- private var _paddingLeft:Number = 0;
-
- /**
- * The left padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingLeft():Number
- {
- return _paddingLeft;
- }
-
- /**
- * @private
- */
- public function set paddingLeft(value:Number):void
- {
- _paddingLeft = value;
- }
-
- /**
- * @private
- */
private var verticalGapInitialized:Boolean;
public static const VERTICAL_GAP_STYLE:String = "verticalGap"
private var _verticalGap:Number = 0;
@@ -444,7 +340,7 @@ package org.apache.royale.jewel.beads.layouts
if(i < numCols)
{
- childW.style.marginTop =
_paddingTop + 'px';
+ childW.style.marginTop = 0 +
'px';//_paddingTop
}
else
{
@@ -457,7 +353,7 @@ package org.apache.royale.jewel.beads.layouts
}
else
{
- childW.style.marginLeft =
_paddingLeft + 'px';
+ childW.style.marginLeft = 0 +
'px';//_paddingLeft
}
childW.royale_wrapper.dispatchEvent('sizeChanged');
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalCenteredLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalCenteredLayout.as
index 41f54c7..d9dae9d 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalCenteredLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalCenteredLayout.as
@@ -88,110 +88,6 @@ package org.apache.royale.jewel.beads.layouts
}
}
- /**
- * @private
- */
- private var _paddingTop:Number = 0;
-
- /**
- * The top padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingTop():Number
- {
- return _paddingTop;
- }
-
- /**
- * @private
- */
- public function set paddingTop(value:Number):void
- {
- _paddingTop = value;
- }
-
- /**
- * @private
- */
- private var _paddingRight:Number = 0;
-
- /**
- * The right padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingRight():Number
- {
- return _paddingRight;
- }
-
- /**
- * @private
- */
- public function set paddingRight(value:Number):void
- {
- _paddingRight = value;
- }
-
- /**
- * @private
- */
- private var _paddingBottom:Number = 0;
-
- /**
- * The top padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingBottom():Number
- {
- return _paddingBottom;
- }
-
- /**
- * @private
- */
- public function set paddingBottom(value:Number):void
- {
- _paddingBottom = value;
- }
-
- /**
- * @private
- */
- private var _paddingLeft:Number = 0;
-
- /**
- * The left padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingLeft():Number
- {
- return _paddingLeft;
- }
-
- /**
- * @private
- */
- public function set paddingLeft(value:Number):void
- {
- _paddingLeft = value;
- }
-
private var gapInitialized:Boolean;
// private var _gap:Boolean;
/**
@@ -344,20 +240,20 @@ package org.apache.royale.jewel.beads.layouts
var data:Object;
var canAdjust:Boolean = false;
- var paddingMetrics:EdgeData = new EdgeData();
- paddingMetrics.left = _paddingLeft;
- paddingMetrics.top = _paddingTop;
- paddingMetrics.right = _paddingRight;
- paddingMetrics.bottom = _paddingBottom;
- var borderMetrics:EdgeData =
(ValuesManager.valuesImpl as
IBorderPaddingMarginValuesImpl).getBorderMetrics(host);
+ // var paddingMetrics:EdgeData = new EdgeData();
+ // paddingMetrics.left = _paddingLeft;
+ // paddingMetrics.top = _paddingTop;
+ // paddingMetrics.right = _paddingRight;
+ // paddingMetrics.bottom = _paddingBottom;
+ // var borderMetrics:EdgeData =
(ValuesManager.valuesImpl as
IBorderPaddingMarginValuesImpl).getBorderMetrics(host);
// adjust the host's usable size by the
metrics. If hostSizedToContent, then the
// resulting adjusted value may be less than
zero.
- hostWidth -= paddingMetrics.left +
paddingMetrics.right + borderMetrics.left + borderMetrics.right;
- hostHeight -= paddingMetrics.top +
paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
+ // hostWidth -= paddingMetrics.left +
paddingMetrics.right + borderMetrics.left + borderMetrics.right;
+ // hostHeight -= paddingMetrics.top +
paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
- var xpos:Number = borderMetrics.left +
paddingMetrics.left;
- var ypos:Number = borderMetrics.top +
paddingMetrics.top;
+ var xpos:Number = 0;//borderMetrics.left +
paddingMetrics.left;
+ var ypos:Number = 0;//borderMetrics.top +
paddingMetrics.top;
// First pass determines the data about the
child.
for(var i:int=0; i < n; i++)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalFlowLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalFlowLayout.as
index b24df45..f2e12bb 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalFlowLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalFlowLayout.as
@@ -89,110 +89,6 @@ package org.apache.royale.jewel.beads.layouts
}
}
- /**
- * @private
- */
- private var _paddingTop:Number = 0;
-
- /**
- * The top padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingTop():Number
- {
- return _paddingTop;
- }
-
- /**
- * @private
- */
- public function set paddingTop(value:Number):void
- {
- _paddingTop = value;
- }
-
- /**
- * @private
- */
- private var _paddingRight:Number = 0;
-
- /**
- * The right padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingRight():Number
- {
- return _paddingRight;
- }
-
- /**
- * @private
- */
- public function set paddingRight(value:Number):void
- {
- _paddingRight = value;
- }
-
- /**
- * @private
- */
- private var _paddingBottom:Number = 0;
-
- /**
- * The top padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingBottom():Number
- {
- return _paddingBottom;
- }
-
- /**
- * @private
- */
- public function set paddingBottom(value:Number):void
- {
- _paddingBottom = value;
- }
-
- /**
- * @private
- */
- private var _paddingLeft:Number = 0;
-
- /**
- * The left padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingLeft():Number
- {
- return _paddingLeft;
- }
-
- /**
- * @private
- */
- public function set paddingLeft(value:Number):void
- {
- _paddingLeft = value;
- }
-
private var gapInitialized:Boolean;
// private var _gap:Boolean;
/**
@@ -345,20 +241,20 @@ package org.apache.royale.jewel.beads.layouts
var data:Object;
var canAdjust:Boolean = false;
- var paddingMetrics:EdgeData = new EdgeData();
- paddingMetrics.left = _paddingLeft;
- paddingMetrics.top = _paddingTop;
- paddingMetrics.right = _paddingRight;
- paddingMetrics.bottom = _paddingBottom;
- var borderMetrics:EdgeData =
(ValuesManager.valuesImpl as
IBorderPaddingMarginValuesImpl).getBorderMetrics(host);
+ // var paddingMetrics:EdgeData = new EdgeData();
+ // paddingMetrics.left = _paddingLeft;
+ // paddingMetrics.top = _paddingTop;
+ // paddingMetrics.right = _paddingRight;
+ // paddingMetrics.bottom = _paddingBottom;
+ // var borderMetrics:EdgeData =
(ValuesManager.valuesImpl as
IBorderPaddingMarginValuesImpl).getBorderMetrics(host);
// adjust the host's usable size by the
metrics. If hostSizedToContent, then the
// resulting adjusted value may be less than
zero.
- hostWidth -= paddingMetrics.left +
paddingMetrics.right + borderMetrics.left + borderMetrics.right;
- hostHeight -= paddingMetrics.top +
paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
+ // hostWidth -= paddingMetrics.left +
paddingMetrics.right + borderMetrics.left + borderMetrics.right;
+ // hostHeight -= paddingMetrics.top +
paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
- var xpos:Number = borderMetrics.left +
paddingMetrics.left;
- var ypos:Number = borderMetrics.top +
paddingMetrics.top;
+ var xpos:Number = 0;//borderMetrics.left +
paddingMetrics.left;
+ var ypos:Number = 0;//borderMetrics.top +
paddingMetrics.top;
// First pass determines the data about the
child.
for(var i:int=0; i < n; i++)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as
index 0143097..24f4bc5 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as
@@ -85,110 +85,6 @@ package org.apache.royale.jewel.beads.layouts
}
}
- /**
- * @private
- */
- private var _paddingTop:Number = 0;
-
- /**
- * The top padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingTop():Number
- {
- return _paddingTop;
- }
-
- /**
- * @private
- */
- public function set paddingTop(value:Number):void
- {
- _paddingTop = value;
- }
-
- /**
- * @private
- */
- private var _paddingRight:Number = 0;
-
- /**
- * The right padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingRight():Number
- {
- return _paddingRight;
- }
-
- /**
- * @private
- */
- public function set paddingRight(value:Number):void
- {
- _paddingRight = value;
- }
-
- /**
- * @private
- */
- private var _paddingBottom:Number = 0;
-
- /**
- * The top padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingBottom():Number
- {
- return _paddingBottom;
- }
-
- /**
- * @private
- */
- public function set paddingBottom(value:Number):void
- {
- _paddingBottom = value;
- }
-
- /**
- * @private
- */
- private var _paddingLeft:Number = 0;
-
- /**
- * The left padding value.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function get paddingLeft():Number
- {
- return _paddingLeft;
- }
-
- /**
- * @private
- */
- public function set paddingLeft(value:Number):void
- {
- _paddingLeft = value;
- }
-
private var gapInitialized:Boolean;
// private var _gap:Boolean;
/**
@@ -346,20 +242,20 @@ package org.apache.royale.jewel.beads.layouts
var data:Object;
var canAdjust:Boolean = false;
- var paddingMetrics:EdgeData = new EdgeData();
- paddingMetrics.left = _paddingLeft;
- paddingMetrics.top = _paddingTop;
- paddingMetrics.right = _paddingRight;
- paddingMetrics.bottom = _paddingBottom;
- var borderMetrics:EdgeData =
(ValuesManager.valuesImpl as
IBorderPaddingMarginValuesImpl).getBorderMetrics(host);
+ // var paddingMetrics:EdgeData = new EdgeData();
+ // paddingMetrics.left = _paddingLeft;
+ // paddingMetrics.top = _paddingTop;
+ // paddingMetrics.right = _paddingRight;
+ // paddingMetrics.bottom = _paddingBottom;
+ // var borderMetrics:EdgeData =
(ValuesManager.valuesImpl as
IBorderPaddingMarginValuesImpl).getBorderMetrics(host);
// adjust the host's usable size by the
metrics. If hostSizedToContent, then the
// resulting adjusted value may be less than
zero.
- hostWidth -= paddingMetrics.left +
paddingMetrics.right + borderMetrics.left + borderMetrics.right;
- hostHeight -= paddingMetrics.top +
paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
+ // hostWidth -= paddingMetrics.left +
paddingMetrics.right + borderMetrics.left + borderMetrics.right;
+ // hostHeight -= paddingMetrics.top +
paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
- var xpos:Number = borderMetrics.left +
paddingMetrics.left;
- var ypos:Number = borderMetrics.top +
paddingMetrics.top;
+ var xpos:Number = 0;//borderMetrics.left +
paddingMetrics.left;
+ var ypos:Number = 0;//borderMetrics.top +
paddingMetrics.top;
// First pass determines the data about the
child.
for(var i:int=0; i < n; i++)
