--- a/DialogBox.st Tue Nov 09 13:55:58 2010 +0100
+++ b/DialogBox.st Wed Nov 17 19:59:22 2010 +0100
@@ -6721,7 +6721,7 @@
The inputField gets model as its model.
Return the inputField."
- |y lbl max relW|
+ |y lbl max relW wLabel|
y := self yPosition.
lbl := Label label:labelString.
@@ -6731,10 +6731,23 @@
self addComponent:lbl indent:leftIndent withHeight:max.
lbl rightInset:0.
+ relativeX isInteger ifTrue:[
+ wLabel := relativeX.
+ ] ifFalse:[
+ wLabel := relW*relativeX.
+ ].
+
lbl
- width:(relW*relativeX);
+ width:wLabel;
left:leftX;
- adjust:labelAdjust; borderWidth:0.
+ adjust:labelAdjust;
+ borderWidth:0.
+
+ relativeX isInteger ifTrue:[
+ lbl preferredExtent:(wLabel @ lbl preferredExtent y).
+ lbl extent:(wLabel @ lbl preferredExtent y).
+ lbl sizeFixed:true.
+ ].
fgColor notNil ifTrue:[
lbl foregroundColor:fgColor
@@ -6742,13 +6755,20 @@
self yPosition:y.
self addComponent:aView tabable:tabable.
- aView
- leftInset:ViewSpacing;
- rightInset:ViewSpacing.
-
- aView
- width:relW*(1.0 - relativeX);
- left:leftX+(relW*relativeX).
+
+ relativeX isInteger ifTrue:[
+ aView
+ leftInset:(ViewSpacing + relativeX);
+ left:0.0;
+ rightInset:ViewSpacing;
+ right:1.0.
+ ] ifFalse:[
+ aView
+ leftInset:ViewSpacing;
+ rightInset:ViewSpacing;
+ width:relW*(1.0 - relativeX);
+ left:leftX+(relW*relativeX).
+ ].
aView isInputField ifTrue:[
self addToInputFieldGroup:aView
@@ -6819,8 +6839,8 @@
dialog accepted ifTrue:[Transcript showCR:model value].
"
- "Created: 17.7.1996 / 15:03:32 / cg"
- "Modified: 26.7.1996 / 18:11:12 / cg"
+ "Created: / 17-07-1996 / 15:03:32 / cg"
+ "Modified: / 17-11-2010 / 19:59:10 / cg"
!
addLabelledField:aView label:labelString adjust:labelAdjust tabable:tabable separateAtX:relativeX
@@ -9487,11 +9507,11 @@
!DialogBox class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.303 2010-10-27 09:37:01 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.304 2010-11-17 18:59:22 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.303 2010-10-27 09:37:01 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.304 2010-11-17 18:59:22 cg Exp $'
! !
DialogBox initialize!