flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject git commit: [flex-asjs] [refs/heads/develop] - Fix for bug FLEX-35201: TileLayout not working. Fixed the JS side by having it use flex-box display.
Date Wed, 07 Dec 2016 21:00:00 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop 327ced48a -> 10e1773d6


Fix for bug FLEX-35201: TileLayout not working. Fixed the JS side by having it use flex-box
display.


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

Branch: refs/heads/develop
Commit: 10e1773d6b63d968063f6f0db01dd56ba8ec2054
Parents: 327ced4
Author: Peter Ent <pent@apache.org>
Authored: Wed Dec 7 15:59:57 2016 -0500
Committer: Peter Ent <pent@apache.org>
Committed: Wed Dec 7 15:59:57 2016 -0500

----------------------------------------------------------------------
 .../org/apache/flex/html/beads/layouts/TileLayout.as     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10e1773d/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/TileLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/TileLayout.as
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/TileLayout.as
index ff869b4..77e752c 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/TileLayout.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/TileLayout.as
@@ -24,6 +24,7 @@ package org.apache.flex.html.beads.layouts
 	import org.apache.flex.core.IParentIUIBase;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.IUIBase;
+	import org.apache.flex.core.IChild;
 	import org.apache.flex.core.UIBase;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
@@ -150,14 +151,15 @@ package org.apache.flex.html.beads.layouts
 				for(var j:int=0; j < n; j++)
 				{
 					var testChild:IUIBase = area.getElementAt(i) as IUIBase;
-					if (testChild || !testChild.visible) realN--;
+					if (testChild == null || !testChild.visible) realN--;
 				}
 
 				if (isNaN(useWidth)) useWidth = Math.floor(host.width / numColumns); // + gap
 				if (isNaN(useHeight)) {
 					// given the width and total number of items, how many rows?
 					var numRows:Number = Math.floor(realN/numColumns);
-					useHeight = Math.floor(host.height / numRows);
+					if (host.isHeightSizedToContent) useHeight = 30; // default height
+					else useHeight = Math.floor(host.height / numRows);
 				}
 
 				var maxWidth:Number = useWidth;
@@ -214,6 +216,8 @@ package org.apache.flex.html.beads.layouts
 				if (n === 0) return false;
 
 				viewBead.contentView.width = host.width;
+				viewBead.contentView.element.style["display"] = "flex";
+				viewBead.contentView.element.style["flex-flow"] = "row wrap";
 
 				var realN:int = n;
 				for (i = 0; i < n; i++)
@@ -231,7 +235,8 @@ package org.apache.flex.html.beads.layouts
 				if (isNaN(useHeight)) {
 					// given the width and total number of items, how many rows?
 					var numRows:Number = Math.floor(realN / numColumns);
-					useHeight = Math.floor(host.height / numRows);
+					if (host.isHeightSizedToContent) useHeight = 30; // default height
+					else useHeight = Math.floor(host.height / numRows);
 				}
 
 				for (i = 0; i < n; i++)


Mime
View raw message