--- a/ToolApplicationModel.st	Wed Jun 30 09:09:35 2004 +0200
+++ b/ToolApplicationModel.st	Sat Jul 03 19:11:48 2004 +0200
@@ -1363,17 +1363,26 @@
     "preferred extent of my window; top/main menu and top toolbar (named by 'menuToolbarView')
      will be considered"
 
-    |window menu menuToolbarView preferredExtentOfWindow|
+    |window menu menuToolbarView preferredExtentOfWindow maxExtent|
 
     window          := self builder window. 
     menu            := window subViews first.
     menuToolbarView := builder componentAt: #menuToolbarView.
 
-    preferredExtentOfWindow := window extent.
-    menu class = MenuPanel ifTrue: [preferredExtentOfWindow := preferredExtentOfWindow max: menu preferredExtent].
-    menuToolbarView notNil ifTrue: [preferredExtentOfWindow := preferredExtentOfWindow max: menuToolbarView preferredExtent].
+    preferredExtentOfWindow := window extent max:window minExtent.
+    menu class == MenuPanel ifTrue:[
+        preferredExtentOfWindow := preferredExtentOfWindow max:menu preferredExtent
+    ].
+    menuToolbarView notNil ifTrue:[
+        preferredExtentOfWindow := preferredExtentOfWindow max:menuToolbarView preferredExtent
+    ].
 
-    ^window minExtent max: (preferredExtentOfWindow min: window maxExtent)
+    maxExtent := window maxExtent.
+    maxExtent notNil ifTrue:[
+        preferredExtentOfWindow := preferredExtentOfWindow min:maxExtent.
+    ].
+
+    ^ preferredExtentOfWindow.
 ! !
 
 !ToolApplicationModel methodsFor:'startup & release'!
@@ -1421,5 +1430,5 @@
 !ToolApplicationModel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/ToolApplicationModel.st,v 1.121 2004-06-07 09:24:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/ToolApplicationModel.st,v 1.122 2004-07-03 17:11:48 stefan Exp $'
 ! !