Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EC15610801 for ; Tue, 8 Sep 2015 06:39:33 +0000 (UTC) Received: (qmail 66032 invoked by uid 500); 8 Sep 2015 06:39:28 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 65983 invoked by uid 500); 8 Sep 2015 06:39:28 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 65969 invoked by uid 99); 8 Sep 2015 06:39:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Sep 2015 06:39:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7EE64E051B; Tue, 8 Sep 2015 06:39:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aharui@apache.org To: commits@flex.apache.org Date: Tue, 08 Sep 2015 06:39:28 -0000 Message-Id: <31ec716ca6104a6f855d1d3f3dabeeeb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/5] git commit: [flex-asjs] [refs/heads/develop] - measure height after layout 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 Authored: Sat Sep 5 22:12:23 2015 -0700 Committer: Alex Harui 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");