--- a/DialogBox.st Thu Aug 24 16:16:27 2017 +0200
+++ b/DialogBox.st Thu Aug 24 16:43:57 2017 +0200
@@ -5056,7 +5056,7 @@
requestText:title
"open a dialog asking for multiline text.
- Return a stringCollection or nil if cancelled."
+ Return a stringCollection or nil if canceled."
^ self
requestText:title initialAnswer:'' initialSelection:nil
@@ -5064,11 +5064,13 @@
"
Dialog requestText:'Bla'
"
+
+ "Modified (comment): / 24-08-2017 / 14:58:18 / cg"
!
requestText:title initialAnswer:initialAnswer
"open a dialog asking for multiline text.
- Return a stringCollection or nil if cancelled."
+ Return a stringCollection or nil if canceled."
^ self
requestText:title initialAnswer:initialAnswer initialSelection:nil
@@ -5076,11 +5078,13 @@
"
Dialog requestText:'Bla' initialAnswer:'Hello world'
"
+
+ "Modified (comment): / 24-08-2017 / 14:58:21 / cg"
!
requestText:title initialAnswer:initialAnswer initialSelection:anIntervalOrNil
"open a dialog asking for multiline text.
- Return a stringCollection or nil if cancelled."
+ Return a stringCollection or nil if canceled."
^ self
requestText:title lines:10 columns:60 initialAnswer:initialAnswer initialSelection:anIntervalOrNil
@@ -5088,11 +5092,13 @@
"
Dialog requestText:'Bla' initialAnswer:'Hello world' initialSelection:(1 to:5)
"
+
+ "Modified (comment): / 24-08-2017 / 14:58:24 / cg"
!
requestText:title lines:numLines columns:numCols initialAnswer:initialText
"open a dialog asking for multiline text.
- Return a stringCollection or nil if cancelled."
+ Return a stringCollection or nil if canceled."
^ self
requestText:title lines:numLines columns:numCols
@@ -5102,12 +5108,13 @@
Dialog requestText:'Bla' lines:8 columns:40 initialAnswer:'hello world'
"
- "Modified: / 18.8.2000 / 21:45:41 / cg"
+ "Modified: / 18-08-2000 / 21:45:41 / cg"
+ "Modified (comment): / 24-08-2017 / 14:58:27 / cg"
!
requestText:title lines:numLines columns:numCols initialAnswer:initialText initialSelection:anIntervalOrNil
"open a dialog asking for multiline text.
- Return a stringCollection or nil if cancelled."
+ Return a stringCollection or nil if canceled."
|dialog textHolder|
@@ -5131,7 +5138,8 @@
requestText:'Bla2' lines:8 columns:40 initialAnswer:'hello world' initialSelection:(1 to:5)
"
- "Modified: / 18.8.2000 / 21:45:41 / cg"
+ "Modified: / 18-08-2000 / 21:45:41 / cg"
+ "Modified (comment): / 24-08-2017 / 14:58:30 / cg"
! !
!DialogBox class methodsFor:'multiple choice dialogs'!
@@ -10356,7 +10364,12 @@
"if any inputFields where added, activate the first one"
verticalPanel notNil ifTrue:[
- verticalPanel extent:verticalPanel preferredExtent.
+ (verticalPanel layout isNil
+ and:[ verticalPanel relativeExtent isNil
+ and:[ verticalPanel extentRule isNil]]
+ ) ifTrue:[
+ verticalPanel extent:verticalPanel preferredExtent.
+ ].
preferredExtent := nil.
self extent:(self preferredExtent).
].
@@ -10374,7 +10387,7 @@
inputFieldGroup activateFirstIfNoCurrent
].
- "Modified: / 28-02-2012 / 15:54:10 / cg"
+ "Modified: / 24-08-2017 / 16:39:51 / cg"
!
resize
@@ -10474,7 +10487,7 @@
That is the max component width, or my current width (default);
whichever is larger, by the sum of the component's heights."
- |w h p|
+ |w h p vPanelExt vPanelHeight|
"/ If I have an explicit preferredExtent..
explicitExtent notNil ifTrue:[
@@ -10490,9 +10503,14 @@
verticalPanel notNil ifTrue:[
"/ because the vertical panels size was not known until now,
"/ it was not counted in the y-position yet.
- "/ do this now.
- verticalPanel extent:(verticalPanel computePreferredExtent).
- h := h + verticalPanel height.
+ "/ Do this now.
+ vPanelExt := verticalPanel computePreferredExtent.
+ vPanelHeight := vPanelExt height.
+
+ "/ verticalPanel extent:vPanelExt.
+ "/ vPanelHeight := verticalPanel height.
+
+ h := h + vPanelHeight.
].
addedComponents notNil ifTrue:[
@@ -10521,7 +10539,7 @@
"/
^ w @ h
- "Modified: 19.7.1996 / 20:43:52 / cg"
+ "Modified: / 24-08-2017 / 16:37:06 / cg"
!
specificationFor:aKey