Fix end time upon deletion of morphs in the editor

hpi-swa-teaching · Aug 1, 2022 · 785736c · 785736c
1 parent 9449f78
commit 785736c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/deleteMorph.st b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/deleteMorph.st
@@ -7,9 +7,15 @@ deleteMorph
 	self selectedTreeNode ifNil: [self updateInformationText: self messageNoMorphSelected. ^ 'break']. 
 	self removeMorphProperties. 
 	self clearPropertyEditorPanel. 
-	self timeline clearTimeline. 
 	self propertyTreeMorph update: self propertyTreeMorph getChildrenSelector.
-	self selectedTreeNode: nil. 
+
+	self propertyList isEmpty
+		ifFalse: [self selectedTreeNode: (self propertyList first).
+			self propertyStartEnd update: #deleteMorph]
+		ifTrue: [self selectedTreeNode: nil.
+			self propertyStartEnd update: #deleteLastMorph].
+
+	self timeline clearTimeline.
 	self updateInformationText: self messageMorphDeleted.
 
 

diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json
@@ -37,7 +37,7 @@
 		"createTextPropertyOn:" : "LW 7/26/2021 16:44",
 		"defaultEmptyPanels" : "DM 8/7/2020 17:37",
 		"defaultPropertyPanelPosition" : "mjs 7/31/2021 16:18",
-		"deleteMorph" : "ob 7/30/2022 17:22",
+		"deleteMorph" : "ps 8/1/2022 18:57",
 		"editorTitle" : "LH 8/4/2020 10:31",
 		"editorTitle:" : "DM 8/3/2020 15:40",
 		"emptyPanels" : "DM 8/7/2020 17:37",

diff --git a/.../AnimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/update..st b/.../AnimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/update..st
@@ -4,4 +4,10 @@ update: aSymbol
 		ifTrue:[self endTime < self findLastKey ifTrue:[self endTime: self findLastKey]]. 
 
 	aSymbol = #deleteKeyframes
-		ifTrue:[self endTime > self findLastKey ifTrue:[self endTime: self findLastKey]]. 
+		ifTrue:[self endTime > self findLastKey ifTrue:[self endTime: self findLastKey]]. 
+
+	aSymbol = #deleteMorph
+		ifTrue:[self endTime: self findLastKey]. 
+
+	aSymbol = #deleteLastMorph
+		ifTrue:[self endTime: self defaultEndTime]. 
diff --git a/...nimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/methodProperties.json b/...nimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/methodProperties.json
@@ -25,4 +25,4 @@
 		"startTime" : "FH 8/1/2021 19:29",
 		"startTime:" : "FH 8/1/2021 19:29",
 		"startTimeAsString" : "FH 8/1/2021 19:30",
-		"update:" : "ob 6/26/2022 17:55" } }
+		"update:" : "ps 8/1/2022 18:58" } }