Repository: flex-asjs Updated Branches: refs/heads/develop 7c6a4cc07 -> 91e3f12c8
measure height after layout Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3ca1f7da Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3ca1f7da Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3ca1f7da Branch: refs/heads/develop Commit: 3ca1f7daa329bb9af9584930c86bb60c7661f87e Parents: 7c6a4cc Author: Alex Harui <[email protected]> Authored: Sat Sep 5 22:12:23 2015 -0700 Committer: Alex Harui <[email protected]> Committed: Sat Sep 5 22:12:23 2015 -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/3ca1f7da/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as index 2191645..5885678 100644 --- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as +++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as @@ -209,7 +209,6 @@ package org.apache.flex.html.beads.layouts mr = 0; } child.y = mt + padding.top; - maxHeight = Math.max(maxHeight, mt + child.height + mb); if (i == 0) { child.x = ml + padding.left; @@ -217,6 +216,7 @@ package org.apache.flex.html.beads.layouts } else child.x = xx - child.width - mr; + maxHeight = Math.max(maxHeight, mt + child.height + mb); xx -= child.width + mr + ml; lastmr = mr; var valign:Object = ValuesManager.valuesImpl.getValue(child, "vertical-align");
