--- a/UILayoutTool.st Fri Jan 18 18:45:00 2013 +0100
+++ b/UILayoutTool.st Mon Jan 21 14:46:54 2013 +0100
@@ -846,6 +846,7 @@
(usePreferredHeight false)
(useDynamicPreferredWidth false)
(useDynamicPreferredHeight false)
+ (keepSpaceForOSXResizeHandle false)
)
do:[:aKeyOrPair| |holder key val|
@@ -1446,11 +1447,26 @@
<resource: #help>
- ^super helpSpec addPairsFrom:#(
+ ^ super helpSpec addPairsFrom:#(
#hrzExtent
'Horizontal extent of the selected widget.'
+#useDynamicPreferredWidth
+'Dynamically adapt to any change of the widget''s preferred width'
+
+#useDynamicPreferredHeight
+'Dynamically adapt to any change of the widget''s preferred height'
+
+#usePreferredHeight
+'Use the widget''s preferred height as initial size'
+
+#usePreferredWidth
+'Use the widget''s preferred width as initial size'
+
+#useDefaultExtent
+'Use the widget''s default extent as initial size'
+
#vrtExtent
'Vertical extent of the selected widget.'
@@ -1482,7 +1498,7 @@
label: 'UILayoutTool-Extent'
name: 'UILayoutTool-Extent'
min: (Point 10 10)
- bounds: (Rectangle 0 0 505 149)
+ bounds: (Rectangle 0 0 506 169)
)
component:
(SpecCollection
@@ -1490,7 +1506,7 @@
(FramedBoxSpec
label: 'Extent'
name: 'FramedBox'
- layout: (LayoutFrame 0 0.0 6 0.0 0 1.0 145 0)
+ layout: (LayoutFrame 0 0.0 6 0.0 0 1.0 158 0)
labelPosition: topLeft
translateLabel: true
component:
@@ -1539,37 +1555,42 @@
acceptOnPointerLeave: false
)
(CheckBoxSpec
- label: 'Use Preferred'
+ label: 'Preferred'
name: 'CheckBox1'
layout: (LayoutFrame 169 0 30 0 275 0 52 0)
+ activeHelpKey: usePreferredWidth
model: usePreferredWidth
translateLabel: true
)
(CheckBoxSpec
label: 'Dynamic'
name: 'CheckBox3'
- layout: (LayoutFrame 276 0 30 0 353 0 52 0)
+ layout: (LayoutFrame 276 0 30 0 371 0 52 0)
+ activeHelpKey: useDynamicPreferredWidth
model: useDynamicPreferredWidth
translateLabel: true
)
(CheckBoxSpec
- label: 'Use Preferred'
+ label: 'Preferred'
name: 'CheckBox2'
layout: (LayoutFrame 169 0 58 0 275 0 80 0)
+ activeHelpKey: usePreferredHeight
model: usePreferredHeight
translateLabel: true
)
(CheckBoxSpec
label: 'Dynamic'
name: 'CheckBox4'
- layout: (LayoutFrame 276 0 58 0 353 0 80 0)
+ layout: (LayoutFrame 276 0 58 0 372 0 80 0)
+ activeHelpKey: useDynamicPreferredHeight
model: useDynamicPreferredHeight
translateLabel: true
)
(CheckBoxSpec
- label: 'Use Widgets Default Extent'
+ label: 'Use Widget''s Default Extent'
name: 'useDefaultExtentCheckBox'
layout: (Point 5 84)
+ activeHelpKey: useDefaultExtent
enableChannel: defaultExtentEnabled
tabable: true
model: useDefaultExtent
@@ -1676,12 +1697,18 @@
^ super helpSpec addPairsFrom:#(
+#bigBottomFixPartLayout
+'Set layout for a big fixed area at the bottom of the widgets container'
+
+#bigHorizontalFixPartLayout
+'Set layout for a big fixed-height area centered vertically in the widgets container'
+
+#bigTopFixPartLayout
+'Set layout for a big fixed area at the top of the widgets container'
+
#bottomAbsolute
'Offset of the bottom edge; positive is to the bottom, negative to the top.'
-#bigBottomFixPartLayout
-'Set layout for a big fixed area at the bottom of the widgets container'
-
#bottomFixPartLayout
'Set layout for a small fixed area at the bottom of the widgets container'
@@ -1703,8 +1730,8 @@
#horizontalFixPartLayout
'Set layout for a small fixed-height area centered vertically in the widgets container'
-#bigHorizontalFixPartLayout
-'Set layout for a big fixed-height area centered vertically in the widgets container'
+#keepSpaceForOSXResizeHandle
+'Keep space at the right for the window resize handle under MAXOS-X; ignored when running on other systems'
#leftFixPartLayout
'Set layout for a small fixed area at the left of the widgets container'
@@ -1745,12 +1772,22 @@
#screenFrameLayout
''
+#useDynamicPreferredWidth
+'Dynamically adapt to any change of the widget''s preferred width'
+
+#useDynamicPreferredHeight
+'Dynamically adapt to any change of the widget''s preferred height'
+
+#usePreferredHeight
+'Use the widget''s preferred height as initial size'
+
+#usePreferredWidth
+'Use the widget''s preferred width as initial size'
+
+
#topFixPartLayout
'Set layout for a small fixed area at the top of the widgets container'
-#bigTopFixPartLayout
-'Set layout for a big fixed area at the top of the widgets container'
-
#topHalfLayout
'Set layout for the top half of the widgets container'
@@ -2189,7 +2226,7 @@
label: 'UILayoutTool-LayoutFrame'
name: 'UILayoutTool-LayoutFrame'
min: (Point 10 10)
- bounds: (Rectangle 0 0 511 302)
+ bounds: (Rectangle 0 0 518 376)
)
component:
(SpecCollection
@@ -2203,7 +2240,7 @@
(FramedBoxSpec
label: 'Corner'
name: 'FramedBox'
- layout: (LayoutFrame 1 0.0 113 0 0 1.0 214 0)
+ layout: (LayoutFrame 1 0.0 113 0 0 1.0 242 0)
labelPosition: topLeft
translateLabel: true
component:
@@ -2212,7 +2249,7 @@
(LabelSpec
label: 'Right:'
name: 'labelRight'
- layout: (AlignmentOrigin 68 0 25 0 1 0.5)
+ layout: (AlignmentOrigin 68 0 16 0 1 0)
translateLabel: true
)
(ActionButtonSpec
@@ -2271,7 +2308,7 @@
(LabelSpec
label: 'Bottom:'
name: 'labelBottom'
- layout: (AlignmentOrigin 68 0 53 0 1 0.5)
+ layout: (AlignmentOrigin 68 0 44 0 1 0)
translateLabel: true
)
(ActionButtonSpec
@@ -2328,40 +2365,52 @@
model: bottomRelativeBottom
)
(CheckBoxSpec
- label: 'Use Preferred'
+ label: 'Preferred'
name: 'CheckBox1'
layout: (LayoutFrame 287 0 14 0 393 0 36 0)
+ activeHelpKey: usePreferredWidth
model: usePreferredWidth
translateLabel: true
)
(CheckBoxSpec
- label: 'Use Preferred'
+ label: 'Preferred'
name: 'CheckBox2'
layout: (LayoutFrame 287 0 42 0 393 0 64 0)
+ activeHelpKey: usePreferredHeight
model: usePreferredHeight
translateLabel: true
)
(CheckBoxSpec
label: 'Dynamic'
name: 'CheckBox3'
- layout: (LayoutFrame 394 0 14 0 471 0 36 0)
+ layout: (LayoutFrame 394 0 14 0 481 0 36 0)
+ activeHelpKey: useDynamicPreferredWidth
model: useDynamicPreferredWidth
translateLabel: true
)
(CheckBoxSpec
label: 'Dynamic'
name: 'CheckBox4'
- layout: (LayoutFrame 394 0 42 0 471 0 64 0)
+ layout: (LayoutFrame 394 0 42 0 481 0 64 0)
+ activeHelpKey: useDynamicPreferredWidth
model: useDynamicPreferredHeight
translateLabel: true
)
+ (CheckBoxSpec
+ label: 'OSX-Resize'
+ name: 'CheckBox5'
+ layout: (LayoutFrame 287 0 70 0 480 0 92 0)
+ activeHelpKey: keepSpaceForOSXResizeHandle
+ model: keepSpaceForOSXResizeHandle
+ translateLabel: true
+ )
)
)
)
(MenuPanelSpec
name: 'commonLayoutToolBar1'
- layout: (LayoutFrame 6 0.0 215 0 -4 1.0 247 0)
+ layout: (LayoutFrame 6 0.0 243 0 -4 1.0 275 0)
level: 0
tabable: true
menu: commonFrameLayoutsMenu1
@@ -2369,7 +2418,7 @@
)
(MenuPanelSpec
name: 'commonLayoutToolBar2'
- layout: (LayoutFrame 6 0.0 255 0 -4 1.0 287 0)
+ layout: (LayoutFrame 6 0.0 283 0 -4 1.0 315 0)
level: 0
tabable: true
menu: commonFrameLayoutsMenu2
@@ -2377,7 +2426,7 @@
)
(MenuPanelSpec
name: 'commonLayoutToolBar3'
- layout: (LayoutFrame 6 0.0 295 0 -4 1.0 327 0)
+ layout: (LayoutFrame 6 0.0 323 0 -4 1.0 355 0)
level: 0
tabable: true
menu: commonFrameLayoutsMenu3
@@ -2669,6 +2718,8 @@
(self aspectFor:#usePreferredHeight) value:(aSpec usePreferredHeight).
(self aspectFor:#useDynamicPreferredWidth) value:(aSpec useDynamicPreferredWidth).
(self aspectFor:#useDynamicPreferredHeight) value:(aSpec useDynamicPreferredHeight).
+
+ (self aspectFor:#keepSpaceForOSXResizeHandle) value:(aSpec keepSpaceForOSXResizeHandle).
!
layout
@@ -3121,3 +3172,4 @@
version_CVS
^ '$Header$'
! !
+