split windowClosed from windowIsClosing

pharo-spec · Jul 28, 2020 · 2548a7d · 2548a7d
1 parent 446009f
commit 2548a7d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/Spec2-Adapters-Morphic/SpMorphicWindowAdapter.class.st b/src/Spec2-Adapters-Morphic/SpMorphicWindowAdapter.class.st
@@ -207,7 +207,7 @@ SpMorphicWindowAdapter >> subscribeToAnnouncements: aWindow [
 	aWindow announcer 
 		when: SpWindowWillClose send: #announce: to: self presenter announcer;
 		when: SpWindowResizing send: #announce: to: self presenter announcer;
-		when: WindowClosed send: #windowIsClosing to: self
+		when: WindowClosed send: #windowClosed to: self
 ]
 
 { #category : #icons }
@@ -227,6 +227,13 @@ SpMorphicWindowAdapter >> title: aString [
 	self widgetDo: [ :w | w setLabel: (aString ifNotNil: [ :theString | theString localizedForPresenter: self presenter]) ]
 ]
 
+{ #category : #updating }
+SpMorphicWindowAdapter >> windowClosed [
+
+	self windowIsClosing.
+	self presenter windowClosed
+]
+
 { #category : #updating }
 SpMorphicWindowAdapter >> windowIsClosing [
 
@@ -236,5 +243,5 @@ SpMorphicWindowAdapter >> windowIsClosing [
 { #category : #updating }
 SpMorphicWindowAdapter >> windowIsOpening [
 
-	self model windowIsOpening
+	self presenter windowIsOpening
 ]
diff --git a/src/Spec2-Core/SpWindowPresenter.class.st b/src/Spec2-Core/SpWindowPresenter.class.st
@@ -556,8 +556,9 @@ SpWindowPresenter >> window: aWindow [
 ]
 
 { #category : #private }
-SpWindowPresenter >> windowClosed [ 
+SpWindowPresenter >> windowClosed [
 
+	isClosed := true.
 	self application windowClosed: self
 ]
 
@@ -573,9 +574,8 @@ SpWindowPresenter >> windowIcon: aForm [
 
 { #category : #updating }
 SpWindowPresenter >> windowIsClosing [
-	isClosed := true.
-	self windowClosed.
-	self presenter windowIsClosing.
+
+	self presenter windowIsClosing
 ]
 
 { #category : #updating }