Repository: flex-asjs Updated Branches: refs/heads/develop f3dd25f40 -> 5ba3a1de3
fix the 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/67f2726d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/67f2726d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/67f2726d Branch: refs/heads/develop Commit: 67f2726d7a6e75e9bfb0d3c5facc536a1fe37a33 Parents: f3dd25f Author: Alex Harui <[email protected]> Authored: Fri Sep 4 13:48:14 2015 -0700 Committer: Alex Harui <[email protected]> Committed: Fri Sep 4 13:48:14 2015 -0700 ---------------------------------------------------------------------- .../flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/67f2726d/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as index 416fb2c..401e417 100644 --- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as +++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as @@ -253,9 +253,9 @@ package org.apache.flex.html.beads.layouts if (!isNaN(ilc.percentHeight)) ilc.setHeight(contentView.height * ilc.percentHeight / 100, true); } - maxHeight = Math.max(maxHeight, mt + child.height + mb); child.x = xx + ml; - child.width = ww - xx - child.x; + child.width = ww - child.x; + maxHeight = Math.max(maxHeight, mt + child.height + mb); valign = ValuesManager.valuesImpl.getValue(child, "vertical-align"); verticalMargins[flexChildIndex] = { marginTop: mt, marginBottom: mb, valign: valign }; }
