changeset 38:69df5369c5f7

Fix filler to only be elastic in the direction of its parent.
author Jordan Miner <jminer7@gmail.com>
date Wed, 29 Jul 2009 23:25:29 -0500
parents f9fea816b1fb
children 04d2867d335c
files dynamin/gui/layout.d
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/dynamin/gui/layout.d	Wed Jul 29 23:24:20 2009 -0500
+++ b/dynamin/gui/layout.d	Wed Jul 29 23:25:29 2009 -0500
@@ -112,7 +112,10 @@
 			}
 			return e;
 		case LayoutType.Filler:
-			return Elasticity.Semi;
+			if(!parent || parent.numColumns > 1 || children.length == 1)
+				return Elasticity.Semi;
+			else
+				return Elasticity.No;
 		case LayoutType.Spacer:
 			return Elasticity.No;
 		}
@@ -133,7 +136,10 @@
 			}
 			return e;
 		case LayoutType.Filler:
-			return Elasticity.Semi;
+			if(!parent || parent.numRows > 1 || children.length == 1)
+				return Elasticity.Semi;
+			else
+				return Elasticity.No;
 		case LayoutType.Spacer:
 			return Elasticity.No;
 		}