FileDialog.st
branchjv
changeset 13250 0decde6c459d
parent 13180 64a4186ddfce
parent 13187 dd48e947da4a
child 13289 cc75e3cd0362
--- a/FileDialog.st	Tue Jul 23 20:55:42 2013 +0100
+++ b/FileDialog.st	Wed Jul 24 11:15:26 2013 +0100
@@ -1860,13 +1860,16 @@
     (aBuilder componentAt:'okButton') cursor:(Cursor thumbsUp).
 
     win := aBuilder window .
-    hMin := (win margin * 2)
-            + aBuilder menuBar preferredHeight
-            + (aBuilder componentAt:#FilenameEntryField) height
-            + (aBuilder componentAt:#ToolBar1) preferredHeight
-            + (aBuilder componentAt:#ButtonPanel) preferredHeight.
+    win minExtent notNil ifTrue:[
+        "minExtent is nil if window is not a TopView"
+        hMin := (win margin * 2)
+                + (aBuilder menuBar isNil ifTrue:[0] ifFalse:[aBuilder menuBar preferredHeight])
+                + (aBuilder componentAt:#FilenameEntryField) height
+                + (aBuilder componentAt:#ToolBar1) preferredHeight
+                + (aBuilder componentAt:#ButtonPanel) preferredHeight.
 
-    win minExtent:( win minExtent x @ hMin ).
+        win minExtent:(win minExtent x @ hMin).
+    ].
     win topView label:self initialText.
 
     super postBuildWith:aBuilder
@@ -2073,11 +2076,11 @@
 !FileDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.128 2013-07-04 14:51:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.129 2013-07-17 06:11:59 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.128 2013-07-04 14:51:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.129 2013-07-17 06:11:59 stefan Exp $'
 !
 
 version_HG
@@ -2086,6 +2089,6 @@
 !
 
 version_SVN
-    ^ '$Id: FileDialog.st,v 1.128 2013-07-04 14:51:00 cg Exp $'
+    ^ '$Id: FileDialog.st,v 1.129 2013-07-17 06:11:59 stefan Exp $'
 ! !