You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/08/14 07:58:20 UTC
[royale-asjs] 07/07: switch to using just 'padding' so it doesn't
overrule other padding. The CSS lookup may need to be smarter about rule
precedence
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch feature/MXRoyale
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 85931a20c42ea30f08bb399b3e7aaa9bde3f8090
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Aug 14 00:57:52 2018 -0700
switch to using just 'padding' so it doesn't overrule other padding. The CSS lookup may need to be smarter about rule precedence
---
.../projects/MXRoyale/src/main/resources/defaults.css | 15 ++++++---------
.../src/main/royale/mx/containers/beads/BoxLayout.as | 8 ++++++--
.../MXRoyale/src/main/royale/mx/core/Container.as | 9 +++++----
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/resources/defaults.css b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
index 07a934d..96e3558 100644
--- a/frameworks/projects/MXRoyale/src/main/resources/defaults.css
+++ b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
@@ -28,21 +28,18 @@
* {
font-family: Verdana;
font-size: 12px;
- whiteSpaceCollapse: "collapse";
- horizontalAlign: "left";
- horizontalGap: 8;
- verticalAlign: "top";
- verticalGap: 6;
- padding-bottom: 0;
- padding-left: 0;
- padding-right: 0;
- padding-top: 0;
}
global {
IStatesImpl: ClassReference("org.apache.royale.core.StatesWithTransitionsImpl");
IEffectTimer: ClassReference("org.apache.royale.utils.EffectTimer");
+ whiteSpaceCollapse: "collapse";
+ horizontalAlign: "left";
+ horizontalGap: 8;
+ verticalAlign: "top";
+ verticalGap: 6;
+ padding : 0px;
}
/* -------------------------------------------------------
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/containers/beads/BoxLayout.as b/frameworks/projects/MXRoyale/src/main/royale/mx/containers/beads/BoxLayout.as
index 0c2f6a9..fac8e12 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/containers/beads/BoxLayout.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/containers/beads/BoxLayout.as
@@ -27,9 +27,12 @@ package mx.containers.beads
import mx.core.EdgeMetrics;
import mx.core.IUIComponent;
+ import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.LayoutBase;
import org.apache.royale.core.UIBase;
+ import org.apache.royale.core.layout.EdgeData;
+ import org.apache.royale.core.ValuesManager;
//import mx.core.mx_internal;
//import mx.core.ScrollPolicy;
@@ -221,9 +224,10 @@ package mx.containers.beads
if (n == 0) return;
var vm:EdgeMetrics = target.viewMetricsAndPadding;
+ var pd:EdgeData = (ValuesManager.valuesImpl as IBorderPaddingMarginValuesImpl).getPaddingMetrics(target);
- var paddingLeft:Number = target.getStyle("paddingLeft");
- var paddingTop:Number = target.getStyle("paddingTop");
+ var paddingLeft:Number = pd.left;
+ var paddingTop:Number = pd.top;
var horizontalAlign:Number = getHorizontalAlignValue();
var verticalAlign:Number = getVerticalAlignValue();
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/Container.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/Container.as
index bef4300..e9f3ea6 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/Container.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/Container.as
@@ -852,11 +852,12 @@ public class Container extends UIComponent
var o:EdgeMetrics = _viewMetricsAndPadding;
var ed:EdgeData = (ValuesManager.valuesImpl as IBorderPaddingMarginValuesImpl).getBorderMetrics(this);
var vm:EdgeMetrics = new EdgeMetrics(ed.left, ed.top, ed.right, ed.bottom);
+ var pd:EdgeData = (ValuesManager.valuesImpl as IBorderPaddingMarginValuesImpl).getPaddingMetrics(this);
- o.left = vm.left + getStyle("paddingLeft");
- o.right = vm.right + getStyle("paddingRight");
- o.top = vm.top + getStyle("paddingTop");
- o.bottom = vm.bottom + getStyle("paddingBottom");
+ o.left = vm.left + pd.left;
+ o.right = vm.right + pd.right;
+ o.top = vm.top + pd.top;
+ o.bottom = vm.bottom + pd.bottom;
return o;
}