Applying permutation does update and updates fixed in tab usage

hpi-swa · Jan 25, 2024 · 9e659df · 9e659df
1 parent ec3fba3
commit 9e659df
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 7 deletions.
diff --git a/packages/Sandblocks-Babylonian/Morph.extension.st b/packages/Sandblocks-Babylonian/Morph.extension.st
@@ -7,7 +7,7 @@ Morph class >> exampleObject [
 ]
 
 { #category : #'*Sandblocks-Babylonian' }
-Morph >> listensToPermutations [
+Morph >> listensToPermutations [ 
 
 	^ false
 ]

diff --git a/packages/Sandblocks-Babylonian/SBExampleCluster.class.st b/packages/Sandblocks-Babylonian/SBExampleCluster.class.st
@@ -71,9 +71,10 @@ SBExampleCluster >> extractedTopHeadingsFrom: aSBMultiverse [
 
 	^ (aSBMultiverse universes collect: [:aUniverse | 
 		self newContainerMorph 
+			listDirection: #leftToRight;
 			addAllMorphsBack: {
-				SBPermutationLabel newDisplaying: aUniverse activePermutation.
-				SBButton newApplyPermutationFor: aUniverse activePermutation}])
+				SBButton newApplyPermutationFor: aUniverse activePermutation.
+				SBPermutationLabel newDisplaying: aUniverse activePermutation}])
 ]
 
 { #category : #accessing }

diff --git a/packages/Sandblocks-Babylonian/SBPermutationLabel.class.st b/packages/Sandblocks-Babylonian/SBPermutationLabel.class.st
@@ -17,7 +17,7 @@ SBPermutationLabel class >> newDisplaying: aSBPermutation [
 ]
 
 { #category : #'*Sandblocks-Babylonian' }
-SBPermutationLabel >> listensToPermutations [
+SBPermutationLabel >> listensToPermutations [ 
 
 	^ true
 ]

diff --git a/packages/Sandblocks-Babylonian/SBPermutationLabel.extension.st b/packages/Sandblocks-Babylonian/SBPermutationLabel.extension.st
@@ -1,7 +1,7 @@
 Extension { #name : #SBPermutationLabel }
 
 { #category : #'*Sandblocks-Babylonian' }
-SBPermutationLabel >> listensToPermutations [
+SBPermutationLabel >> listensToPermutations [ 
 
 	^ true
 ]
diff --git a/packages/Sandblocks-Core/SBTabView.class.st b/packages/Sandblocks-Core/SBTabView.class.st
@@ -142,6 +142,14 @@ SBTabView >> addTab [
 	self add: (self active veryDeepCopy name: self activeName, '_i')
 ]
 
+{ #category : #'submorphs - enumerating' }
+SBTabView >> allMorphsDepthFirstDo: aBlock [ 
+
+	submorphs do: [:m | m allMorphsDepthFirstDo: aBlock].
+	(self namedBlocks reject: [:m | m = self active]) do: [:m | m block allMorphsDepthFirstDo: aBlock].
+	aBlock value: self
+]
+
 { #category : #ui }
 SBTabView >> asTabButton: aNamedBlock [
 

diff --git a/packages/Sandblocks-Morphs/SBButton.class.st b/packages/Sandblocks-Morphs/SBButton.class.st
@@ -18,8 +18,7 @@ SBButton class >> newApplyPermutationFor: aPermutation [
 				size: 8.0 sbScaled;
 				color: (Color r: 0.0 g: 1 b: 0.0))
 			label: 'Apply'
-			do: [aPermutation apply.
-				self sandblockEditor sendNewPermutationNotification];
+			do: [aPermutation apply];
 		makeSmall;
 		cornerStyle: #squared
 ]

diff --git a/packages/Sandblocks-Utils/SBPermutation.class.st b/packages/Sandblocks-Utils/SBPermutation.class.st
@@ -54,6 +54,9 @@ SBPermutation >> apply [
 	self referencedVariants do: [:aVariant | aVariant switchToAlternative: (self at: aVariant id)].
 	(Set newFrom: (referencedVariants collect: #containingArtefact thenSelect: #isMethod))
 		do: [:aMethodBlock | aMethodBlock sandblockEditor save: aMethodBlock tryFixing: true quick: true].
+	((Set newFrom: (referencedVariants collect: #sandblockEditor))
+		reject: #isNil)
+		do: #sendNewPermutationNotification
 ]
 
 { #category : #converting }