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:20 UTC
[03/30] git commit: [flex-asjs] [refs/heads/develop] - fix height
calculation
fix height calculation
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/34527c2d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/34527c2d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/34527c2d
Branch: refs/heads/develop
Commit: 34527c2d24fd548de14e475112d730e9c5036534
Parents: 24c8403
Author: Alex Harui <ah...@apache.org>
Authored: Mon Oct 13 12:42:42 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Oct 17 22:38:42 2014 -0700
----------------------------------------------------------------------
.../flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/34527c2d/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 6003f43..1cb558e 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
@@ -152,7 +152,7 @@ package org.apache.flex.html.beads.layouts
mr = 0;
}
child.y = mt;
- maxHeight = Math.max(maxHeight, ml + child.height + mr);
+ maxHeight = Math.max(maxHeight, mt + child.height + mb);
if (i == 0)
{
child.x = ml;