Add #isSettledIn: on space phases + Adopt Bloc's #deferAndSettle: (#401)

Author: tinchodias

src/Toplo-Demo/ToDemoPresenter.class.st

@@ -59,14 +59,15 @@ ToDemoPresenter class >> demo3 [
 	{
 		ToRawTheme.
 		ToRawDarkTheme } do: [ :themeClass |
-			containerElement addChild: (ToRadioButton new
+			containerElement addChild:
+				(ToRadioButton new
 					 labelText: themeClass label;
 					 in: [ :rad | rad userData at: #themeClass put: themeClass ];
 					 yourself) ].
 
 	containerElement groupCheckAction: [ :evt |
-			containerElement space toTheme:
-				(evt checkedList anyOne userData at: #themeClass) new ].
+		containerElement space toTheme:
+			(evt checkedList anyOne userData at: #themeClass) new ].
 
 	containerElement children second checked: true.
 
@@ -94,8 +95,8 @@ ToDemoPresenter class >> open [
 { #category : #private }
 ToDemoPresenter >> drawOnCanvas: anElement [
 
-	self canva space toTheme: ToRawTheme new.
-	super drawOnCanvas: anElement.
+	self canvas space toTheme: ToRawTheme new.
+	super drawOnCanvas: anElement
 ]
 
 { #category : #accessing }

src/Toplo-Demo/ToSkinDemoStyleSheetTest.class.st

@@ -60,10 +60,10 @@ ToSkinDemoStyleSheetTest >> testRuleBackgroundDependsOnParentOrChildren [
 		              position: 150 @ 50.
 	childElem := ToElement new.
 	parentElem addChild: childElem.
-	space toTheme: theme.
-	space root addChild: elem.
-	space root addChild: parentElem.
-	self waitTestingSpaces.
+	space deferAndSettle: [
+		space toTheme: theme.
+		space root addChild: elem.
+		space root addChild: parentElem ].
 	self assert: elem background paint color equals: Color red.
 	self assert: parentElem background paint color equals: Color blue.
 	self assert: childElem background paint color equals: Color green
@@ -112,9 +112,9 @@ ToSkinDemoStyleSheetTest >> testRuleBackgroundDependsOnSibling [
 			sibling1.
 			sibling2 }.
 
-	space toTheme: theme.
-	space root addChild: container.
-	self waitTestingSpaces.
+	space deferAndSettle: [
+		space toTheme: theme.
+		space root addChild: container ].
 	self assert: sibling1 background paint color equals: Color blue.
 	self assert: sibling2 background paint color equals: Color green.
 	self assert: container background paint color equals: Color red
@@ -168,27 +168,18 @@ ToSkinDemoStyleSheetTest >> testRuleBackgroundDependsOnSizeWithActionBlock [
 		              extent: 100 asPoint;
 		              position: 150 asPoint.
 
-	space root addChild: elem.
-	space root addChild: verticalElem.
-	space root addChild: horizontalElem.
-	space root addChild: biggerElem.
-
-	assertsTested := false.
-	space root whenLayoutedDoOnce: [
-			assertsTested := true.
-			space toTheme: theme.
-			self waitTestingSpaces.
-			self assert: elem background paint color equals: Color green.
-			self
-				assert: verticalElem background paint color
-				equals: Color yellow.
-			self
-				assert: horizontalElem background paint color
-				equals: Color blue.
-			self assert: biggerElem background paint color equals: Color red ].
-
-	space root forceLayout.
-	self assert: assertsTested
+	space deferAndSettle: [
+		space root addChild: elem.
+		space root addChild: verticalElem.
+		space root addChild: horizontalElem.
+		space root addChild: biggerElem ].
+
+	space deferAndSettle: [ space toTheme: theme ].
+
+	self assert: elem background paint color equals: Color green.
+	self assert: verticalElem background paint color equals: Color yellow.
+	self assert: horizontalElem background paint color equals: Color blue.
+	self assert: biggerElem background paint color equals: Color red
 ]
 
 { #category : #tests }

src/Toplo-Examples/ToExWorkspace.class.st

@@ -15,7 +15,7 @@ Class {
 ToExWorkspace class >> open [
 
 	<script>
-	self openInHost: BlOSWindowSDL2Host new
+	self openInHost: BlOSWindowSDL2Host default
 ]
 
 { #category : #'instance creation' }
@@ -33,14 +33,14 @@ ToExWorkspace class >> openInHost: aBlOSWindowHost [
 ToExWorkspace class >> openInMorphic [
 
 	<script>
-	self openInHost: BlMorphicWindowHost new
+	self openInHost: BlMorphicWindowHost default
 ]
 
 { #category : #'instance creation' }
 ToExWorkspace class >> openInSDL [
 
 	<script>
-	self openInHost: BlOSWindowSDL2Host new
+	self openInHost: BlOSWindowSDL2Host default
 ]
 
 { #category : #binding }

src/Toplo-Examples/ToExperiments.class.st

@@ -697,8 +697,7 @@ ToExperiments class >> example_PasteUpWithPlaceHolder [
 			event consume ].
 	blue addEventHandlerOn: BlDragEvent do: [ :event |
 			event consume.
-			blue position: event position - pblue.
-			blue forceLayout ].
+			blue position: event position - pblue ].
 	blue addEventHandlerOn: BlDragEndEvent do: [ :event | event consume ].
 
 	blue
@@ -1621,7 +1620,6 @@ ToExperiments class >> example_twoChildrenMatchParentInFitContent [
 			c vertical matchParent ].
 	parent addChild: child.
 	parent addChild: child2.
-	parent forceLayout.
 	^ parent openInSpace 
 ]
 

src/Toplo-Examples/ToExperimentsMockTest.class.st

@@ -7,15 +7,7 @@ Class {
 { #category : #tests }
 ToExperimentsMockTest >> closeWindows [
 
-	{
-		BlOSWindowSDL2Host.
-		BlMorphicWindowHost } do: [ :host |
-			host universe closeSpaces.
-			host
-				stop;
-				start ].
-	BlSpace allInstances do: [ :each | each close ].
-	BlParallelUniverse all do: [ :each | each closeSpaces ]
+	Toplo closeSpaces
 ]
 
 { #category : #tests }

src/Toplo-Examples/ToFiniteListElementStresserWithActionMethods.class.st

@@ -171,7 +171,7 @@ ToFiniteListElementStresserWithActionMethods >> processBlock [
 		  self maxRound timesRepeat: [
 				  round := round + 1.
 				  self selectActionsToRun shuffled do: [ :act |
-					  list inUIProcessDo: [ self perform: act with: list ] ] ].
+					  list deferOrValue: [ self perform: act with: list ] ] ].
 		  endTime := DateAndTime now.
 		  (endTime - startTime) asDuration traceCr ]
 ]

src/Toplo-Examples/ToListElementStresser.class.st

@@ -31,7 +31,7 @@ ToListElementStresser class >> run [
 ToListElementStresser class >> runInSDL [
 
 	<script>
-	self new runInHost: BlOSWindowSDL2Host new
+	self new runInHost: BlOSWindowSDL2Host default
 ]
 
 { #category : #actions }

src/Toplo-Examples/ToListElementStresserWithAdditionalSelecters.class.st

@@ -22,7 +22,7 @@ ToListElementStresserWithAdditionalSelecters class >> run [
 ToListElementStresserWithAdditionalSelecters class >> runInSDL [
 
 	<script>
-	self new runInHost: BlOSWindowSDL2Host new
+	self new runInHost: BlOSWindowSDL2Host default
 ]
 
 { #category : #actions }

src/Toplo-Examples/ToSandBox.class.st

@@ -3396,9 +3396,10 @@ ToSandBox class >> example_ListWithAllClassesAndTraitsSorted [
 	| l vscrollBar space |
 	l := ToListElement new nodeBuilder: [ :node :dataItem :holder |
 			node ensureCanManageToploSkin.
-		     node addChild: (ToClassNameViewExamplePart new
-				      class: dataItem position: holder position;
-				      yourself) ].
+			node addChild:
+				(ToClassNameViewExamplePart new
+					class: dataItem position: holder position;
+					yourself) ].
 	l withRowNumbers.
 	l dataAccessor addAll:
 		(Smalltalk allClassesAndTraits sorted: [ :a :b | a name < b name ]).
@@ -3692,7 +3693,6 @@ ToSandBox class >> example_Menu2 [
 
 { #category : #menu }
 ToSandBox class >> example_Menu3 [
-	<demo>
 
 	| container |
 	container := ToElement new matchParent.
@@ -6137,7 +6137,6 @@ ToSandBox class >> example_ToggleButtonInListElement [
 
 	space := BlSpace new.
 	space root addChild: moveListElement.
-	space pulse.
 	space resizable: true.
 	space show
 ]
@@ -7141,7 +7140,7 @@ ToSandBox class >> example_hugePane [
 	space root addChild: pane.
 	space show.
 
-	space root inUIProcessDo: [
+	space root deferOrValue: [
 			1 to: 100 do: [ :i | 
 					| label button |
 					label := 'Button ' , i asString.

src/Toplo-Examples/ToSandBoxMockTest.class.st

@@ -7,15 +7,7 @@ Class {
 { #category : #tests }
 ToSandBoxMockTest >> closeWindows [
 
-	{
-		BlOSWindowSDL2Host.
-		BlMorphicWindowHost } do: [ :host |
-			host universe closeSpaces.
-			host
-				stop;
-				start ].
-	BlSpace allInstances do: [ :each | each close ].
-	BlParallelUniverse all do: [ :each | each closeSpaces ]
+	Toplo closeSpaces
 ]
 
 { #category : #tests }