--- a/LSelBox.st Wed Feb 21 00:56:21 1996 +0100
+++ b/LSelBox.st Wed Feb 21 01:02:15 1996 +0100
@@ -11,10 +11,10 @@
"
EnterBox subclass:#ListSelectionBox
- instanceVariableNames:'selectionList'
- classVariableNames:''
- poolDictionaries:''
- category:'Views-DialogBoxes'
+ instanceVariableNames:'selectionList'
+ classVariableNames:''
+ poolDictionaries:''
+ category:'Views-DialogBoxes'
!
!ListSelectionBox class methodsFor:'documentation'!
@@ -237,30 +237,32 @@
"return my preferred extent - thats the minimum size
I like to have, to make everything visible"
- |wWanted hWanted eH|
+ |wWanted hWanted eH mm|
+
+ mm := ViewSpacing.
- wWanted := labelField width + ViewSpacing + ViewSpacing.
+ wWanted := mm + labelField width + mm.
(wWanted > width) ifFalse:[
- wWanted := width
+ wWanted := width
].
enterField notNil ifTrue:[
- eH := enterField height + ViewSpacing
+ eH := enterField height + mm
] ifFalse:[
- eH := 0
+ eH := 0
].
- hWanted := ViewSpacing + labelField height +
- eH +
- ViewSpacing + selectionList height +
- ViewSpacing + buttonPanel preferredExtent y +
- ViewSpacing - (ViewSpacing * 2).
+ hWanted := mm + labelField height +
+ eH +
+ mm + selectionList height +
+ mm + buttonPanel preferredExtent y +
+ mm - (mm * 2).
(hWanted < height) ifTrue:[
- hWanted := height
+ hWanted := height
].
^ (wWanted @ hWanted)
- "Modified: 26.10.1995 / 17:13:53 / cg"
+ "Modified: 21.2.1996 / 01:01:02 / cg"
! !
!ListSelectionBox methodsFor:'user actions'!
@@ -285,5 +287,5 @@
!ListSelectionBox class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Attic/LSelBox.st,v 1.22 1996-02-04 20:40:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Attic/LSelBox.st,v 1.23 1996-02-21 00:01:15 cg Exp $'
! !
--- a/ListSelectionBox.st Wed Feb 21 00:56:21 1996 +0100
+++ b/ListSelectionBox.st Wed Feb 21 01:02:15 1996 +0100
@@ -11,10 +11,10 @@
"
EnterBox subclass:#ListSelectionBox
- instanceVariableNames:'selectionList'
- classVariableNames:''
- poolDictionaries:''
- category:'Views-DialogBoxes'
+ instanceVariableNames:'selectionList'
+ classVariableNames:''
+ poolDictionaries:''
+ category:'Views-DialogBoxes'
!
!ListSelectionBox class methodsFor:'documentation'!
@@ -237,30 +237,32 @@
"return my preferred extent - thats the minimum size
I like to have, to make everything visible"
- |wWanted hWanted eH|
+ |wWanted hWanted eH mm|
+
+ mm := ViewSpacing.
- wWanted := labelField width + ViewSpacing + ViewSpacing.
+ wWanted := mm + labelField width + mm.
(wWanted > width) ifFalse:[
- wWanted := width
+ wWanted := width
].
enterField notNil ifTrue:[
- eH := enterField height + ViewSpacing
+ eH := enterField height + mm
] ifFalse:[
- eH := 0
+ eH := 0
].
- hWanted := ViewSpacing + labelField height +
- eH +
- ViewSpacing + selectionList height +
- ViewSpacing + buttonPanel preferredExtent y +
- ViewSpacing - (ViewSpacing * 2).
+ hWanted := mm + labelField height +
+ eH +
+ mm + selectionList height +
+ mm + buttonPanel preferredExtent y +
+ mm - (mm * 2).
(hWanted < height) ifTrue:[
- hWanted := height
+ hWanted := height
].
^ (wWanted @ hWanted)
- "Modified: 26.10.1995 / 17:13:53 / cg"
+ "Modified: 21.2.1996 / 01:01:02 / cg"
! !
!ListSelectionBox methodsFor:'user actions'!
@@ -285,5 +287,5 @@
!ListSelectionBox class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/ListSelectionBox.st,v 1.22 1996-02-04 20:40:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/ListSelectionBox.st,v 1.23 1996-02-21 00:01:15 cg Exp $'
! !
--- a/OptBox.st Wed Feb 21 00:56:21 1996 +0100
+++ b/OptBox.st Wed Feb 21 01:02:15 1996 +0100
@@ -353,9 +353,11 @@
preferredExtent
"return a size to make everything fit into myself"
- |w w1 h maxH prefPanel|
+ |w w1 h maxH prefPanel mm|
- w1 := ViewSpacing + formLabel width + ViewSpacing + textLabel width + ViewSpacing.
+ mm := ViewSpacing.
+
+ w1 := (mm * 3) + formLabel width + textLabel width.
prefPanel := buttonPanel preferredExtent.
w := w1 max:prefPanel x.
@@ -365,17 +367,17 @@
"/ ].
maxH := prefPanel y.
- h := ViewSpacing
- + ((formLabel height) max:(textLabel height))
- + ViewSpacing + ViewSpacing
- + maxH
- + ViewSpacing.
+ h := (mm * 4)
+ + ((formLabel height) max:(textLabel height))
+ + maxH.
^ w @ h
+
+ "Modified: 21.2.1996 / 01:00:14 / cg"
! !
!OptionBox class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Attic/OptBox.st,v 1.25 1996-02-11 09:53:59 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Attic/OptBox.st,v 1.26 1996-02-21 00:02:15 cg Exp $'
! !
--- a/OptionBox.st Wed Feb 21 00:56:21 1996 +0100
+++ b/OptionBox.st Wed Feb 21 01:02:15 1996 +0100
@@ -353,9 +353,11 @@
preferredExtent
"return a size to make everything fit into myself"
- |w w1 h maxH prefPanel|
+ |w w1 h maxH prefPanel mm|
- w1 := ViewSpacing + formLabel width + ViewSpacing + textLabel width + ViewSpacing.
+ mm := ViewSpacing.
+
+ w1 := (mm * 3) + formLabel width + textLabel width.
prefPanel := buttonPanel preferredExtent.
w := w1 max:prefPanel x.
@@ -365,17 +367,17 @@
"/ ].
maxH := prefPanel y.
- h := ViewSpacing
- + ((formLabel height) max:(textLabel height))
- + ViewSpacing + ViewSpacing
- + maxH
- + ViewSpacing.
+ h := (mm * 4)
+ + ((formLabel height) max:(textLabel height))
+ + maxH.
^ w @ h
+
+ "Modified: 21.2.1996 / 01:00:14 / cg"
! !
!OptionBox class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/OptionBox.st,v 1.25 1996-02-11 09:53:59 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/OptionBox.st,v 1.26 1996-02-21 00:02:15 cg Exp $'
! !