[royale-asjs] 02/02: fix up Container after removing CSSContainerUtils

[aharui]

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 c83e8d3526828d02dc5b56e5b17ae4e0a32317fd
Author: Alex Harui <aha...@apache.org>
AuthorDate: Mon Apr 9 09:22:28 2018 -0700

    fix up Container after removing CSSContainerUtils
---
 .../projects/MXRoyale/src/main/royale/mx/core/Container.as       | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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 616926c..3650819 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/Container.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/Container.as
@@ -21,6 +21,7 @@ package mx.core
 {
        import org.apache.royale.core.ContainerBaseStrandChildren;
        import org.apache.royale.core.IBeadLayout;
+    import org.apache.royale.core.IBorderPaddingMarginValuesImpl
        import org.apache.royale.core.IChild;
        import org.apache.royale.core.IContainer;
        import org.apache.royale.core.IContentViewHost;
@@ -31,13 +32,12 @@ package mx.core
        import org.apache.royale.core.IParent;
        import org.apache.royale.core.IStatesImpl;
        import org.apache.royale.core.IStrandPrivate;
+    import org.apache.royale.core.layout.EdgeData;
        import org.apache.royale.core.ValuesManager;
        import org.apache.royale.events.Event;
        import org.apache.royale.events.ValueChangeEvent;
        import org.apache.royale.events.ValueEvent;
-       import org.apache.royale.geom.Rectangle;
        import org.apache.royale.states.State;
-       import org.apache.royale.utils.CSSContainerUtils;
        import org.apache.royale.utils.MXMLDataInterpreter;
        import org.apache.royale.utils.loadBeadFromValuesManager;
 
@@ -704,9 +704,8 @@ public class Container extends UIComponent
                }
                
                var o:EdgeMetrics = _viewMetricsAndPadding;
-               var vm:EdgeMetrics = new EdgeMetrics();//viewMetrics;
-               var rect:Rectangle = CSSContainerUtils.getBorderMetrics(this);
-               vm.convertFromRectangle(rect);
+               var ed:EdgeData = (ValuesManager.valuesImpl as 
IBorderPaddingMarginValuesImpl).getBorderMetrics(this);
+        var vm:EdgeMetrics = new EdgeMetrics(ed.left, ed.top, ed.right, 
ed.bottom);
                
                o.left = vm.left + getStyle("paddingLeft");
                o.right = vm.right + getStyle("paddingRight");

-- 
To stop receiving notification emails like this one, please contact
aha...@apache.org.