Mercurial > projects > dynamin
comparison dynamin/gui/layout.d @ 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 |
comparison
equal
deleted
inserted
replaced
37:f9fea816b1fb | 38:69df5369c5f7 |
---|---|
110 if(e == Elasticity.Yes) | 110 if(e == Elasticity.Yes) |
111 return e; | 111 return e; |
112 } | 112 } |
113 return e; | 113 return e; |
114 case LayoutType.Filler: | 114 case LayoutType.Filler: |
115 return Elasticity.Semi; | 115 if(!parent || parent.numColumns > 1 || children.length == 1) |
116 return Elasticity.Semi; | |
117 else | |
118 return Elasticity.No; | |
116 case LayoutType.Spacer: | 119 case LayoutType.Spacer: |
117 return Elasticity.No; | 120 return Elasticity.No; |
118 } | 121 } |
119 } | 122 } |
120 //}}} | 123 //}}} |
131 if(e == Elasticity.Yes) | 134 if(e == Elasticity.Yes) |
132 return e; | 135 return e; |
133 } | 136 } |
134 return e; | 137 return e; |
135 case LayoutType.Filler: | 138 case LayoutType.Filler: |
136 return Elasticity.Semi; | 139 if(!parent || parent.numRows > 1 || children.length == 1) |
140 return Elasticity.Semi; | |
141 else | |
142 return Elasticity.No; | |
137 case LayoutType.Spacer: | 143 case LayoutType.Spacer: |
138 return Elasticity.No; | 144 return Elasticity.No; |
139 } | 145 } |
140 } | 146 } |
141 //}}} | 147 //}}} |