#BUGFIX by cg
authorClaus Gittinger <cg@exept.de>
Sun, 22 Oct 2017 01:29:32 +0200
changeset 6220 319368c35cb9
parent 6219 d78391800b32
child 6221 c7b2afbe561d
#BUGFIX by cg class: EnterBox comment/format in: #reAdjustGeometry changed: #preferredExtent fixed preferredExtent if something wide was added to the vPanel.
EnterBox.st
--- a/EnterBox.st	Sat Oct 21 23:16:22 2017 +0200
+++ b/EnterBox.st	Sun Oct 22 01:29:32 2017 +0200
@@ -572,7 +572,10 @@
     labelField resize.
     okButton resize.
     abortButton resize.
+
     self resize
+
+    "Modified (format): / 22-10-2017 / 01:20:18 / cg"
 ! !
 
 !EnterBox methodsFor:'queries'!
@@ -581,7 +584,7 @@
     "compute the boxes preferredExtent from the components' sizes"
 
     |wWanted hWanted vs2 min
-     labelPref enterPref panelPref|
+     labelPref enterPref bPanelPref vPanelPref|
 
     "/ If I have an explicit preferredExtent..
     explicitExtent notNil ifTrue:[
@@ -593,15 +596,18 @@
         ^ preferredExtent
     ].
 
-    panelPref := buttonPanel preferredExtent.
+    bPanelPref := buttonPanel preferredExtent.
     labelPref := labelField preferredExtent.
     enterPref := enterField preferredExtent.
-    wWanted := (labelPref x max:enterPref x) max:panelPref x.
+    wWanted := (labelPref x max:enterPref x) max:bPanelPref x.
 
     hWanted := labelPref y + ViewSpacing + enterPref y +
-               ViewSpacing + panelPref y + ViewSpacing.
+               ViewSpacing + bPanelPref y + ViewSpacing.
+
     verticalPanel notNil ifTrue:[
-        hWanted := hWanted + ViewSpacing + (verticalPanel preferredHeight).
+        vPanelPref := verticalPanel preferredExtent.
+        hWanted := hWanted + ViewSpacing + (vPanelPref y).
+        wWanted := wWanted max:vPanelPref x.
     ].
 
     vs2 := ViewSpacing * 2.
@@ -612,8 +618,8 @@
     ^ wWanted @ hWanted
 
     "Modified: / 22-01-1998 / 09:57:55 / md"
-    "Modified: / 27-07-1998 / 20:18:41 / cg"
     "Modified: / 30-03-2017 / 18:42:12 / stefan"
+    "Modified: / 22-10-2017 / 01:26:34 / cg"
 ! !
 
 !EnterBox methodsFor:'startup'!