--- a/UILayoutTool.st Fri Jul 18 11:47:47 2008 +0200
+++ b/UILayoutTool.st Fri Jul 18 11:55:06 2008 +0200
@@ -839,6 +839,11 @@
leftAlignmentFraction topAlignmentFraction
(useDefaultExtent false)
(defaultExtentEnabled false)
+
+ (usePreferredWidth false)
+ (usePreferredHeight false)
+ (useDynamicPreferredWidth false)
+ (useDynamicPreferredHeight false)
)
do:[:aKeyOrPair| |holder key val|
@@ -856,8 +861,6 @@
tabList := Array new:size.
1 to:size do:[:i| tabList at:i put:((slices at:i) first) ].
-
-
! !
!UILayoutTool methodsFor:'selection'!
@@ -2150,8 +2153,7 @@
label: 'UILayoutTool-LayoutFrame'
name: 'UILayoutTool-LayoutFrame'
min: (Point 10 10)
- bounds: (Rectangle 0 0 399 303)
- forceRecursiveBackground: false
+ bounds: (Rectangle 0 0 511 302)
)
component:
(SpecCollection
@@ -2289,6 +2291,34 @@
tabable: true
model: bottomRelativeBottom
)
+ (CheckBoxSpec
+ label: 'Use Preferred'
+ name: 'CheckBox1'
+ layout: (LayoutFrame 287 0 14 0 393 0 36 0)
+ model: usePreferredWidth
+ translateLabel: true
+ )
+ (CheckBoxSpec
+ label: 'Use Preferred'
+ name: 'CheckBox2'
+ layout: (LayoutFrame 287 0 42 0 393 0 64 0)
+ model: usePreferredHeight
+ translateLabel: true
+ )
+ (CheckBoxSpec
+ label: 'Dynamic'
+ name: 'CheckBox3'
+ layout: (LayoutFrame 394 0 14 0 471 0 36 0)
+ model: useDynamicPreferredWidth
+ translateLabel: true
+ )
+ (CheckBoxSpec
+ label: 'Dynamic'
+ name: 'CheckBox4'
+ layout: (LayoutFrame 394 0 42 0 471 0 64 0)
+ model: useDynamicPreferredHeight
+ translateLabel: true
+ )
)
)
@@ -2581,7 +2611,6 @@
!UILayoutTool::LayoutFrame methodsFor:'accessing'!
fetch:aView spec:aSpec
-
|layout|
aSpec class == WindowSpec ifTrue:[
@@ -2600,10 +2629,14 @@
(self aspectFor:#rightFraction) value:(layout rightFraction).
(self aspectFor:#bottomFraction) value:(layout bottomFraction).
+ (self aspectFor:#usePreferredWidth) value:(aSpec usePreferredWidth).
+ (self aspectFor:#usePreferredHeight) value:(aSpec usePreferredHeight).
+ (self aspectFor:#useDynamicPreferredWidth) value:(aSpec useDynamicPreferredWidth).
+ (self aspectFor:#useDynamicPreferredHeight) value:(aSpec useDynamicPreferredHeight).
!
layout
- "returns current layout as layoutFrame
+ "returns the current layout as layoutFrame
"
|layout|