DialogBox.st
changeset 4216 4d5603687943
parent 4208 d0f960563da8
child 4217 9453a5aa3fcf
--- a/DialogBox.st	Sat Jan 22 15:32:38 2011 +0100
+++ b/DialogBox.st	Sat Jan 22 18:52:48 2011 +0100
@@ -6744,7 +6744,8 @@
 
     y := self yPosition.
     lbl := Label label:labelString.
-    max := lbl preferredHeight max:(aView preferredHeight).
+
+    max := lbl preferredHeight max:(aView preferredHeight max:aView height).
 
     relW := rightX - leftX.
 
@@ -6773,6 +6774,10 @@
     ].
 
     self yPosition:y.
+
+    aView preferredExtent:(aView preferredExtent x @ max).
+    aView height:max.
+
     self addComponent:aView tabable:tabable.
 
     relativeX isInteger ifTrue:[
@@ -6788,6 +6793,7 @@
             width:relW*(1.0 - relativeX); 
             left:leftX+(relW*relativeX).
     ].
+    aView height:max.
 
     aView isInputField ifTrue:[
         self addToInputFieldGroup:aView
@@ -6797,7 +6803,8 @@
         self name:lbl as:(aName , '.label').
         self name:aView as:aName
     ].
-    ^ aView
+
+    ^ aView                         
 
     "
      |dialog model field|
@@ -6859,7 +6866,7 @@
     "
 
     "Created: / 17-07-1996 / 15:03:32 / cg"
-    "Modified: / 17-11-2010 / 19:59:10 / cg"
+    "Modified: / 22-01-2011 / 18:50:58 / cg"
 !
 
 addLabelledField:aView label:labelString adjust:labelAdjust tabable:tabable separateAtX:relativeX
@@ -9526,11 +9533,11 @@
 !DialogBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.305 2010-12-22 18:33:41 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.306 2011-01-22 17:52:48 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.305 2010-12-22 18:33:41 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.306 2011-01-22 17:52:48 cg Exp $'
 ! !
 
 DialogBox initialize!