Merge pull request #1539 from pharo-spec/dev-3.0

fix layouts
pharo-spec · Apr 15, 2024 · 2be6762 · 2be6762
2 parents 6909e9e + f828b1f
commit 2be6762
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 39 deletions.
diff --git a/src/Spec2-Dialogs/SpAbstractMessageDialog.class.st b/src/Spec2-Dialogs/SpAbstractMessageDialog.class.st
@@ -43,7 +43,10 @@ SpAbstractMessageDialog >> adjustExtentToLabelHeight: anExtent [
 { #category : 'private' }
 SpAbstractMessageDialog >> calculateLabelHeight [
 
-	^ (self calculateLabelHeightForTextWithoutMargin: label text forExtent: self extent) + self labelMargin
+	^ (self 
+			calculateLabelHeightForTextWithoutMargin: label text 
+			forExtent: self extent) 
+		+ self labelMargin
 ]
 
 { #category : 'private' }
@@ -60,19 +63,15 @@ SpAbstractMessageDialog >> calculateLabelHeightForTextWithoutMargin: aText forEx
 SpAbstractMessageDialog >> defaultLayout [
 
 	^ SpBoxLayout newTopToBottom
-		  spacing: 0;
-		  add: (SpBoxLayout newLeftToRight
-				   add: (SpBoxLayout newTopToBottom
-							 vAlignStart; 
-						    add: #image;
-						    yourself)
-				   expand: false;
-				   add: #label withConstraints: [ :c |
-				   c
-					   expand: true;
-					   fill: true ];
-				   yourself);
-		  yourself
+		add: (SpBoxLayout newLeftToRight
+			add: (SpBoxLayout newTopToBottom
+					vAlignStart; 
+					add: image;
+					yourself)
+				expand: false;
+			add: label expand: true;
+			yourself);
+		yourself
 ]
 
 { #category : 'accessing' }

diff --git a/src/Spec2-Dialogs/SpRequestDialog.class.st b/src/Spec2-Dialogs/SpRequestDialog.class.st
@@ -104,18 +104,19 @@ SpRequestDialog >> connectPresenters [
 SpRequestDialog >> defaultLayout [
 
 	^ SpBoxLayout newTopToBottom
-		  spacing: 5;
-		  add: (SpBoxLayout newLeftToRight
-				   add: (SpBoxLayout newTopToBottom
-						    vAlignStart;
-						    add: #image;
-						    yourself)
-				   expand: false;
-				   add: #label expand: true;
-				   yourself) height: self calculateLabelHeight;
-		  add: #textInput expand: false;
-		  add: #errorLabel;
-		  yourself
+		spacing: 5;
+		add: (SpBoxLayout newLeftToRight
+				add: (SpBoxLayout newTopToBottom
+					vAlignStart;
+					add: image;
+					yourself)
+				expand: false;
+				add: label expand: true;
+				yourself) 
+			height: self calculateLabelHeight;
+		add: textInput expand: false;
+		add: errorLabel;
+		yourself
 ]
 
 { #category : 'accessing' }

diff --git a/src/Spec2-Dialogs/SpRequestTextDialog.class.st b/src/Spec2-Dialogs/SpRequestTextDialog.class.st
@@ -36,19 +36,19 @@ SpRequestTextDialog class >> exampleModal [
 SpRequestTextDialog >> defaultLayout [
 
 	^ SpBoxLayout newTopToBottom
-		  spacing: 5;
-		  add: (SpBoxLayout newLeftToRight
-				   add: (SpBoxLayout newTopToBottom
-						    vAlignStart;
-						    add: #image;
-						    yourself)
-				   expand: false;
-				   add: #label expand: true;
-				   yourself)
-		  height: self calculateLabelHeight;
-		  add: #textInput expand: true;
-		  add: #errorLabel expand: false;
-		  yourself
+		spacing: 5;
+	  	add: (SpBoxLayout newLeftToRight
+				add: (SpBoxLayout newTopToBottom
+						vAlignStart;
+						add: image;
+						yourself)
+					expand: false;
+				add: label expand: true;
+				yourself)
+	  		height: self calculateLabelHeight;
+		add: textInput expand: true;
+		add: errorLabel expand: false;
+		yourself
 ]
 
 { #category : 'initialization' }