flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [1/2] git commit: [flex-asjs] [refs/heads/develop] - switch this back to && so we only go down this path when sized to content
Date Sun, 24 May 2015 06:45:57 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop 53955f9fa -> 5bc08dcf2


switch this back to && so we only go down this path when sized to content


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/77590875
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/77590875
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/77590875

Branch: refs/heads/develop
Commit: 775908759ff9547892980080b2f126652452c573
Parents: 53955f9
Author: Alex Harui <aharui@apache.org>
Authored: Sat May 23 23:44:01 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Sat May 23 23:44:01 2015 -0700

----------------------------------------------------------------------
 .../HTML/as/src/org/apache/flex/html/beads/ContainerView.as        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/77590875/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
index ba3968d..b9f302c 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
@@ -98,7 +98,7 @@ package org.apache.flex.html.beads
             
             var host:UIBase = value as UIBase;
             
-            if (host.isWidthSizedToContent() || host.isHeightSizedToContent())
+            if (host.isWidthSizedToContent() && host.isHeightSizedToContent())
             {
                 // if both dimensions are sized to content, then only draw the
                 // borders, etc, after a child is added.  The children in an MXML


Mime
View raw message