jump to last save button, variant proxy deletion deletes variant even…

… if method closed
hpi-swa · Mar 8, 2024 · 360e8d6 · 360e8d6
1 parent 520c8ed
commit 360e8d6
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 16 deletions.
diff --git a/packages/Sandblocks-Babylonian/SBExample.class.st b/packages/Sandblocks-Babylonian/SBExample.class.st
@@ -323,7 +323,7 @@ SBExample >> lastError: anError [
 				"ToolSet debugException: anError"
 				^ reportedError := self sandblockEditor
 					reportError: anError
-					process: ((Process forContext: anError signalerContext copyStack priority: Processor activeProcess priority)
+					process: ((Process forContext: anError signal copyStack priority: Processor activeProcess priority)
 						shouldResumeFromDebugger: false;
 						yourself)
 					source: self].

diff --git a/packages/Sandblocks-Babylonian/SBExampleCluster.class.st b/packages/Sandblocks-Babylonian/SBExampleCluster.class.st
@@ -100,10 +100,12 @@ SBExampleCluster >> newTopRowFrom: aCollectionOfPermutationLabels [
 			wrappedLabel := (self wrapInCell: aLabel owner 
 										flexVertically: true 
 										flexHorizontally: false) borderWidth: 0.
-			button := SBButton newApplyPermutationFor: aLabel permutation.
-			button addFlexShell clipSubmorphs: false.
-			button rotationDegrees: 90.
-			button owner width > wrappedLabel width ifTrue: [button makeTiny].
+			"Rotating morphs somehow clips their right border, so dirty hack so container gets clipped 1px"
+			button := self newContainerMorph 
+				cellInset: 1;
+				addMorphBack: (SBButton newApplyPermutationFor: aLabel permutation);
+				rotationDegrees: 90.
+			button owner width > wrappedLabel width ifTrue: [button firstSubmorph makeTiny].
 
 			self newContainerMorph 
 				cellPositioning: #bottomToTop;

diff --git a/packages/Sandblocks-Babylonian/SBExploriants.class.st b/packages/Sandblocks-Babylonian/SBExploriants.class.st
@@ -67,6 +67,17 @@ SBExploriants >> binding: aString for: block class: aClass ifPresent: aBlock [
 	^ nil
 ]
 
+{ #category : #ui }
+SBExploriants >> buildTabs [
+
+	self addMorphBack: (SBRow new
+		addAllMorphsBack: (self namedBlocks collect: [:block | self asTabButton: block]);
+		name: #tabs;
+		changeTableLayout;
+		listDirection: #leftToRight;
+		hResizing: #shrinkWrap)
+]
+
 { #category : #ui }
 SBExploriants >> buildView [
 
@@ -140,6 +151,12 @@ SBExploriants >> selector [
 	^ nil
 ]
 
+{ #category : #accessing }
+SBExploriants >> tabs [
+
+	^ (self submorphNamed: #tabs) submorphs
+]
+
 { #category : #actions }
 SBExploriants >> tryToUpdateInBackgroundAfterChangeIn: aMethodBlock [
 

diff --git a/packages/Sandblocks-Babylonian/SBLiveView.class.st b/packages/Sandblocks-Babylonian/SBLiveView.class.st
@@ -5,7 +5,8 @@ Class {
 		'broadcaster',
 		'errorDecorator',
 		'errorIcon',
-		'reportedError'
+		'reportedError',
+		'lastSave'
 	],
 	#category : #'Sandblocks-Babylonian'
 }
@@ -64,7 +65,7 @@ SBLiveView >> buildSetUpRow [
 { #category : #building }
 SBLiveView >> buttons [
 
-	^ super buttons, {self rebuildButton}
+	^ super buttons, {self rebuildButton. self reloadLastSaveButton}
 ]
 
 { #category : #actions }
@@ -98,6 +99,16 @@ SBLiveView >> initialize [
 
 ]
 
+{ #category : #building }
+SBLiveView >> jumpToLastSave [
+
+	lastSave ifNil: [^ self].
+	broadcaster containers do: [:otherContainer |
+			self privateRegisterListener: lastSave veryDeepCopy 
+				for: (SBExploriants objectToPermutation at: (otherContainer  valueOfProperty: #sbListener)) 
+				in: otherContainer ]
+]
+
 { #category : #accessing }
 SBLiveView >> listeners [
 
@@ -172,6 +183,16 @@ SBLiveView >> rebuildRegisteredListenerFor: aPermutation in: aContainer [
 
 ]
 
+{ #category : #building }
+SBLiveView >> reloadLastSaveButton [
+
+	^ SBButton new
+		icon: SBIcon iconRotateRight
+			label: 'Reset To Last Synch'
+			do: [self jumpToLastSave ];
+		cornerStyle: #squared
+]
+
 { #category : #actions }
 SBLiveView >> reportError: anError [
 
@@ -223,6 +244,7 @@ SBLiveView >> synchronizePreviewsWith: aContainer [
 
 	| replacingListener |
 	replacingListener := (aContainer valueOfProperty: #sbListener).
+	lastSave := replacingListener veryDeepCopy.
 	(broadcaster containers reject: [:someContainer | aContainer == someContainer])
 		do: [:otherContainer |
 			self privateRegisterListener: replacingListener veryDeepCopy 

diff --git a/packages/Sandblocks-Morphs/SBButton.class.st b/packages/Sandblocks-Morphs/SBButton.class.st
@@ -15,7 +15,7 @@ SBButton class >> newApplyPermutationFor: aPermutation [
 
 	^ self new
 		icon: (SBIcon iconArrowDown
-				size: 12.0 sbScaled;
+				size: 10.0 sbScaled;
 				color: (Color r: 0.0 g: 1 b: 0.0))
 			label: 'Apply'
 			do: [aPermutation apply];

diff --git a/packages/Sandblocks-Smalltalk/SBVariant.class.st b/packages/Sandblocks-Smalltalk/SBVariant.class.st
@@ -86,7 +86,7 @@ SBVariant class >> named: aString associations: aCollectionOfAssociations active
 	aBoolean ifFalse: [^ defaultBehavior value].
 
 	"Always prioritize the permutation which is marked as active"
-	SBActiveVariantPermutation value ifNotNil: [^ (aCollectionOfAssociations at: (SBActiveVariantPermutation value at: uuid)) value value].
+	SBActiveVariantPermutation value ifNotNil: [^ (aCollectionOfAssociations at: (SBActiveVariantPermutation value at: uuid) ifAbsent: [^ defaultBehavior value]) value value].
 
 	"The requesting object does not require dynamic update behavior in which it needs to know a certain alternative"
 	SBExploriants objectToPermutation at: (requestor := thisContext sender receiver) ifAbsent: [^ defaultBehavior value].
@@ -95,7 +95,7 @@ SBVariant class >> named: aString associations: aCollectionOfAssociations active
 	"An outdated permutation in which an alternative with a higher index than current has been deleted"
 	aCollectionOfAssociations at: (requiredPermutation at: uuid) ifAbsent: [^ defaultBehavior value].
 
-	^ (aCollectionOfAssociations at: (requiredPermutation at: uuid)) value value
+	^ (aCollectionOfAssociations at: (requiredPermutation at: uuid) ifAbsent: [^defaultBehavior value]) value value
 ]
 
 { #category : #'instance creation' }
@@ -146,7 +146,7 @@ SBVariant >> activeIndex [
 	^ self widget activeIndex
 ]
 
-{ #category : #actions }
+{ #category : #accessing }
 SBVariant >> activeMutateCommandWithNewValue: aBoolean [
 
 	^ SBMutatePropertyCommand new
@@ -375,7 +375,7 @@ SBVariant >> namedBlocks [
 	^ self widget namedBlocks 
 ]
 
-{ #category : #actions }
+{ #category : #callbacks }
 SBVariant >> nestedActiveCommands: allCommands [
 
 	allCommands add: (self activeMutateCommandWithNewValue: true).
@@ -384,7 +384,7 @@ SBVariant >> nestedActiveCommands: allCommands [
 			aVariant nestedActiveCommands: allCommands]] 
 ]
 
-{ #category : #actions }
+{ #category : #callbacks }
 SBVariant >> nestedInactiveCommands: allCommands [
 
 	allCommands add: (self activeMutateCommandWithNewValue: false).

diff --git a/packages/Sandblocks-Smalltalk/SBVariantProxy.class.st b/packages/Sandblocks-Smalltalk/SBVariantProxy.class.st
@@ -17,7 +17,8 @@ SBVariantProxy class >> for: aVariant [
 { #category : #callbacks }
 SBVariantProxy >> artefactChanged: anArtefact [
 
-	anArtefact = self ifTrue: [ self updateOriginalWithOwnValues ].
+
+	anArtefact = self ifTrue: [self updateOriginalWithOwnValues ].
 
 	(anArtefact = self containedMethod)
 		ifTrue: [ self updateSelfAfterMethodUpdate: anArtefact ]
@@ -101,10 +102,16 @@ SBVariantProxy >> updateOriginalWithOwnValues [
 	variantThatNeedsChanging ifNil: [^self delete].
 
 	original replaceBy: (original := self firstSubmorph copyBlock).
-	original isVariant ifFalse: [^ self delete].
+	original isVariant 
+		ifFalse: [
+			self containedMethod save.
+			^ self delete].
 
 	variantThatNeedsChanging replaceValuesFrom: original copyBlock.
-	self sandblockEditor markChanged: self containedMethod
+	self containedMethod isInEditor
+		ifTrue: [self sandblockEditor markChanged: self containedMethod] 
+		ifFalse: [self containedMethod save].
+
 ]
 
 { #category : #callbacks }