Fix preferred and dynamic preferred sizes
Allow preferred and dynamic preferred sizes for extent layout
--- a/UILayoutTool.st Mon Mar 23 20:48:47 2009 +0100
+++ b/UILayoutTool.st Mon Mar 23 20:48:48 2009 +0100
@@ -1478,7 +1478,7 @@
label: 'UILayoutTool-Extent'
name: 'UILayoutTool-Extent'
min: (Point 10 10)
- bounds: (Rectangle 0 0 326 149)
+ bounds: (Rectangle 0 0 505 149)
)
component:
(SpecCollection
@@ -1495,13 +1495,13 @@
(LabelSpec
label: 'Width:'
name: 'labelWidth'
- layout: (AlignmentOrigin 89 0 24 0 1 0.5)
+ layout: (AlignmentOrigin 89 0 41 0 1 0.5)
translateLabel: true
adjust: right
)
(InputFieldSpec
name: 'fieldLeftOffset'
- layout: (LayoutFrame 90 0 13 0 140 0 35 0)
+ layout: (LayoutFrame 90 0 30 0 140 0 52 0)
activeHelpKey: hrzExtent
enableChannel: notUsingDefaultExtent
tabable: true
@@ -1516,13 +1516,13 @@
(LabelSpec
label: 'Height:'
name: 'labelHeight'
- layout: (AlignmentOrigin 89 0 49 0 1 0.5)
+ layout: (AlignmentOrigin 89 0 66 0 1 0.5)
translateLabel: true
adjust: right
)
(InputFieldSpec
name: 'fieldRightOffset'
- layout: (LayoutFrame 90 0 38 0 140 0 60 0)
+ layout: (LayoutFrame 90 0 55 0 140 0 77 0)
activeHelpKey: vrtExtent
enableChannel: notUsingDefaultExtent
tabable: true
@@ -1535,9 +1535,37 @@
acceptOnPointerLeave: false
)
(CheckBoxSpec
+ label: 'Use Preferred'
+ name: 'CheckBox1'
+ layout: (LayoutFrame 169 0 30 0 275 0 52 0)
+ model: usePreferredWidth
+ translateLabel: true
+ )
+ (CheckBoxSpec
+ label: 'Dynamic'
+ name: 'CheckBox3'
+ layout: (LayoutFrame 276 0 30 0 353 0 52 0)
+ model: useDynamicPreferredWidth
+ translateLabel: true
+ )
+ (CheckBoxSpec
+ label: 'Use Preferred'
+ name: 'CheckBox2'
+ layout: (LayoutFrame 169 0 58 0 275 0 80 0)
+ model: usePreferredHeight
+ translateLabel: true
+ )
+ (CheckBoxSpec
+ label: 'Dynamic'
+ name: 'CheckBox4'
+ layout: (LayoutFrame 276 0 58 0 353 0 80 0)
+ model: useDynamicPreferredHeight
+ translateLabel: true
+ )
+ (CheckBoxSpec
label: 'Use Widgets Default Extent'
name: 'useDefaultExtentCheckBox'
- layout: (Point 5 67)
+ layout: (Point 5 84)
enableChannel: defaultExtentEnabled
tabable: true
model: useDefaultExtent
@@ -1550,7 +1578,7 @@
(PopUpListSpec
label: 'Common Extents'
name: 'CommonExtentsPopUpList'
- layout: (LayoutFrame 179 0 35 0 304 0 57 0)
+ layout: (LayoutFrame 189 0 21 0 314 0 43 0)
tabable: true
menu: listOfCommonExtents
useIndex: true
@@ -1575,6 +1603,10 @@
(self aspectFor:#leftOffset) value:(extent x).
(self aspectFor:#topOffset) value:(extent y).
+ (self aspectFor:#usePreferredWidth) value:(aSpec usePreferredWidth).
+ (self aspectFor:#usePreferredHeight) value:(aSpec usePreferredHeight).
+ (self aspectFor:#useDynamicPreferredWidth) value:(aSpec useDynamicPreferredWidth).
+ (self aspectFor:#useDynamicPreferredHeight) value:(aSpec useDynamicPreferredHeight).
(self aspectFor:#useDefaultExtent) value:aSpec useDefaultExtent
!
@@ -2624,8 +2656,8 @@
(self aspectFor:#leftFraction) value:(layout leftFraction).
(self aspectFor:#topOffset) value:(layout topOffset).
(self aspectFor:#topFraction) value:(layout topFraction).
- (self aspectFor:#rightOffset) value:(layout rightOffset).
- (self aspectFor:#bottomOffset) value:(layout bottomOffset).
+ (self aspectFor:#rightOffset) value:(layout rightOffset value). "take care of blocks"
+ (self aspectFor:#bottomOffset) value:(layout bottomOffset value). "take care of blocks"
(self aspectFor:#rightFraction) value:(layout rightFraction).
(self aspectFor:#bottomFraction) value:(layout bottomFraction).
@@ -2715,9 +2747,9 @@
setFrameLeft:lF offset:lO right:rF offset:rO top:tF offset:tO bottom:bF offset:bO
(self aspectFor:#leftOffset) value:lO.
- (self aspectFor:#rightOffset) value:rO.
+ (self aspectFor:#rightOffset) value:rO value.
(self aspectFor:#topOffset) value:tO.
- (self aspectFor:#bottomOffset) value:bO.
+ (self aspectFor:#bottomOffset) value:bO value.
(self aspectFor:#leftFraction) value:lF.
(self aspectFor:#rightFraction) value:rF.