Avoid having shapes finalized if a document close operation is cancelled

Author: ericksson

Pinta.Core/Managers/WorkspaceManager.cs

@@ -382,13 +382,14 @@ public void SetActiveDocument (
 		actions.Window.SetActiveDocument (open_documents[index]);
 	}
 
-	internal void SetActiveDocumentInternal (
-		ToolManager tools,
-		Document document)
+    internal void SetActiveDocumentInternal (
+        ToolManager tools,
+        Document document,
+        bool suppressCommit = false)
 	{
 		// Work around a case where we closed a document but haven't updated
 		// the active_document_index yet and it points to the closed document
-		if (HasOpenDocuments && active_document_index != -1 && open_documents.Count > active_document_index)
+		if (!suppressCommit && HasOpenDocuments && active_document_index != -1 && open_documents.Count > active_document_index)
 			tools.Commit ();
 
 		int index = open_documents.IndexOf (document);
@@ -397,6 +398,13 @@ internal void SetActiveDocumentInternal (
 		OnActiveDocumentChanged (EventArgs.Empty);
 	}
 
+    public void SetActiveDocumentForClose (Document document)
+	{
+		// Sets the active document in preparation for closing it. This avoids committing
+		// tool state when switching, so canceling the close will not finalize editable shapes, for example.
+        SetActiveDocumentInternal (PintaCore.Tools, document, suppressCommit: true);
+	}
+
 	private void OnActiveDocumentChanged (EventArgs _)
 	{
 		ActiveDocumentChanged?.Invoke (this, EventArgs.Empty);

Pinta/MainWindow.cs

@@ -150,7 +150,7 @@ private void DockNotebook_TabClosed (object? sender, TabClosedEventArgs e)
 		if (PintaCore.Workspace.OpenDocuments.IndexOf (view.Document) < 0)
 			return;
 
-		PintaCore.Actions.Window.SetActiveDocument (view.Document);
+        PintaCore.Workspace.SetActiveDocumentForClose (view.Document);
 		PintaCore.Actions.File.Close.Activate ();
 
 		if (PintaCore.Workspace.OpenDocuments.IndexOf (view.Document) < 0)