flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [1/6] git commit: [flex-asjs] [refs/heads/develop] - fix flexjsstore by allowing children to initiate resizing only when not laying out
Date Wed, 26 Aug 2015 06:16:37 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop bead628e9 -> a54a1ff2b


fix flexjsstore by allowing children to initiate resizing only when not laying out


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

Branch: refs/heads/develop
Commit: ac6f848944f0413e06f309a97d028eeb17ae16a7
Parents: bead628
Author: Alex Harui <aharui@apache.org>
Authored: Tue Aug 25 15:54:49 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Aug 25 15:54:49 2015 -0700

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


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ac6f8489/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 36d6a03..979a9e2 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
@@ -354,10 +354,12 @@ package org.apache.flex.html.beads
 				}
 			}
 			
+            resizingChildren = true;
 			if (layout) {
 				layout.layout();
 				determineContentSizeFromChildren();
 			}
+            resizingChildren = false;
 			
 			adjustSizeAfterLayout();
 		}
@@ -519,7 +521,7 @@ package org.apache.flex.html.beads
 			resizingChildren = true;
 			
 			var child:UIBase = event.target as UIBase;
-//			performLayout(event);
+			performLayout(event);
 			resizingChildren = false;
 		}
 		


Mime
View raw message