flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [24/50] git commit: [flex-asjs] [refs/heads/develop] - fix bug in margin handling
Date Thu, 25 Sep 2014 16:04:06 GMT
fix bug in margin handling


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

Branch: refs/heads/develop
Commit: 90e73a209b29d74231c376a1961bfadc6f8f3c42
Parents: 7d679ef
Author: Alex Harui <aharui@apache.org>
Authored: Tue Sep 23 09:42:24 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Sep 23 15:01:17 2014 -0700

----------------------------------------------------------------------
 .../flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as  | 2 +-
 .../apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90e73a20/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
index 2e315b1..c331d5b 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
@@ -160,7 +160,7 @@ package org.apache.flex.html.beads.layouts
 				xx -= child.width + mr + ml;
 				lastmr = mr;
 				var valign:Object = ValuesManager.valuesImpl.getValue(child, "vertical-align");
-				verticalMargins.push({ marginTop: marginTop, marginBottom: marginBottom, valign: valign
});
+				verticalMargins.push({ marginTop: mt, marginBottom: mb, valign: valign });
 			}
 			for (i = 0; i < n; i++)
 			{

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90e73a20/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as
b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as
index 3d133de..1da19a8 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.as
@@ -154,7 +154,7 @@ package org.apache.flex.html.beads.layouts
 				xx = child.x + child.width;
 				lastmr = mr;
 				var valign:Object = ValuesManager.valuesImpl.getValue(child, "vertical-align");
-				verticalMargins.push({ marginTop: marginTop, marginBottom: marginBottom, valign: valign
});
+				verticalMargins.push({ marginTop: mt, marginBottom: mb, valign: valign });
 			}
 			for (i = 0; i < n; i++)
 			{


Mime
View raw message