ensure clean up of box morph

llast morph was remaining alive because first and last cells were keeping a reference to target morph, which is not good when you are removing a presenter and keeping alive its parent to future use)
pharo-spec · Jan 24, 2024 · ffce4ff · ffce4ff
1 parent 0503480
commit ffce4ff
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/src/Spec2-Adapters-Morphic/SpAbstractMorphicAdapter.class.st b/src/Spec2-Adapters-Morphic/SpAbstractMorphicAdapter.class.st
@@ -661,7 +661,6 @@ SpAbstractMorphicAdapter >> type: aString [
 SpAbstractMorphicAdapter >> unsubscribe [
 
 	super unsubscribe.
-
 	self presenter hasAnnouncer ifFalse: [ ^ self ].
 	self presenter announcer 
 		unsubscribe: self widget;

diff --git a/src/Spec2-Adapters-Morphic/SpMorphicBoxAdapter.class.st b/src/Spec2-Adapters-Morphic/SpMorphicBoxAdapter.class.st
@@ -250,6 +250,7 @@ SpMorphicBoxAdapter >> remove: aPresenter [
 
 	aPresenter adapter ifNotNil: [ :adapter |
 		| morph |
+		adapter unsubscribe.
 		morph := adapter widget.
 		startPanel removeMorph: morph.
 		endPanel removeMorph: morph.

diff --git a/src/Spec2-Adapters-Morphic/SpMorphicBoxLayoutCalculator.class.st b/src/Spec2-Adapters-Morphic/SpMorphicBoxLayoutCalculator.class.st
@@ -37,6 +37,19 @@ SpMorphicBoxLayoutCalculator class >> newProperties: anObject [
 { #category : 'calculating' }
 SpMorphicBoxLayoutCalculator >> calculateFor: aMorph in: newBounds [
 
+	[ self doCalculateFor: aMorph in: newBounds ]
+	ensure: [ self cleanUp ]
+]
+
+{ #category : 'private' }
+SpMorphicBoxLayoutCalculator >> cleanUp [
+
+	firstCell := lastCell := nil
+]
+
+{ #category : 'calculating' }
+SpMorphicBoxLayoutCalculator >> doCalculateFor: aMorph in: newBounds [
+
 	self subclassResponsibility
 ]
 

diff --git a/src/Spec2-Adapters-Morphic/SpMorphicBoxLayoutCalculatorLeftToRight.class.st b/src/Spec2-Adapters-Morphic/SpMorphicBoxLayoutCalculatorLeftToRight.class.st
@@ -53,7 +53,7 @@ SpMorphicBoxLayoutCalculatorLeftToRight >> calculateCellFor: aMorph [
 ]
 
 { #category : 'calculating' }
-SpMorphicBoxLayoutCalculatorLeftToRight >> calculateFor: aMorph in: newBounds [
+SpMorphicBoxLayoutCalculatorLeftToRight >> doCalculateFor: aMorph in: newBounds [
 	"An optimized left-to-right list layout"	
 	| inset extent posX posY centering extraPerCell cell amount last submorphs |
 
@@ -126,6 +126,5 @@ SpMorphicBoxLayoutCalculatorLeftToRight >> calculateFor: aMorph in: newBounds [
 				width := width + amount ].
 		cell target layoutInBounds: (posX @ posY extent: width @ height).
 		posX := posX + width + inset.
-		cell := cell nextCell ].
-
+		cell := cell nextCell ]
 ]
diff --git a/src/Spec2-Adapters-Morphic/SpMorphicBoxLayoutCalculatorTopToBottom.class.st b/src/Spec2-Adapters-Morphic/SpMorphicBoxLayoutCalculatorTopToBottom.class.st
@@ -44,7 +44,7 @@ SpMorphicBoxLayoutCalculatorTopToBottom >> calculateCellFor: aMorph [
 ]
 
 { #category : 'calculating' }
-SpMorphicBoxLayoutCalculatorTopToBottom >> calculateFor: aMorph in: newBounds [
+SpMorphicBoxLayoutCalculatorTopToBottom >> doCalculateFor: aMorph in: newBounds [
 	"An optimized top-to-bottom list layout"
 	| inset extent posX posY centering extraPerCell cell amount last submorphs |
 
@@ -107,7 +107,7 @@ SpMorphicBoxLayoutCalculatorTopToBottom >> calculateFor: aMorph in: newBounds [
 	number := 0.
 	extra := last := 0.
 	cell := firstCell.
-	[cell == nil] whileFalse:[
+	[ cell == nil ] whileFalse:[
 		number := number + 1.
 		height := cell cellSize.
 		(extraPerCell > 0 and:[cell vSpaceFill]) ifTrue:[
@@ -117,6 +117,5 @@ SpMorphicBoxLayoutCalculatorTopToBottom >> calculateFor: aMorph in: newBounds [
 		].
 		cell target layoutInBounds: (posX @ posY extent: width @ height).
 		posY := posY + height + inset.
-		cell := cell nextCell.
-	].
+		cell := cell nextCell ]
 ]