You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/10/18 07:43:31 UTC
[14/30] git commit: [flex-asjs] [refs/heads/develop] - adjust
vertical positioning logic
adjust vertical positioning logic
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/437483e2
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/437483e2
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/437483e2
Branch: refs/heads/develop
Commit: 437483e290b5539ee6d5f59a1feea5a2622269cb
Parents: dc0060e
Author: Alex Harui <ah...@apache.org>
Authored: Tue Oct 14 11:55:03 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Oct 17 22:38:45 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/437483e2/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 1cb558e..81afce9 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
@@ -170,7 +170,7 @@ package org.apache.flex.html.beads.layouts
var obj:Object = verticalMargins[0]
child = contentView.getElementAt(i) as IUIBase;
if (obj.valign == "middle")
- child.y = maxHeight - child.height / 2;
+ child.y = (maxHeight - child.height) / 2;
else if (valign == "bottom")
child.y = maxHeight - child.height - obj.marginBottom;
else
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/437483e2/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 6a2fe41..113f719 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
@@ -176,7 +176,7 @@ package org.apache.flex.html.beads.layouts
ilc.setHeight(contentView.height * ilc.percentHeight / 100);
}
if (obj.valign == "middle")
- child.y = maxHeight - child.height / 2;
+ child.y = (maxHeight - child.height) / 2;
else if (valign == "bottom")
child.y = maxHeight - child.height - obj.marginBottom;
else