Merge pull request #3 from IdeasOnCanvas/enhancement/discardUndoHistory

discard redo history when document is closed
Patrick-Kladek · Dec 22, 2017 · bd091b2 · bd091b2
2 parents 42a7183 + 5b34ec5
commit bd091b2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/Screenshot Framer/Document.swift b/Screenshot Framer/Document.swift
@@ -62,6 +62,16 @@ final class Document: NSDocument {
         return true
     }
 
+    override func canClose(withDelegate delegate: Any, shouldClose shouldCloseSelector: Selector?, contextInfo: UnsafeMutableRawPointer?) {
+        self.layerStateHistory.discardRedoHistory()
+
+        if self.isDocumentEdited && self.fileURL != nil {
+            self.save(nil)
+        }
+        self.close()
+    }
+
+
     // Responder Chain
 
     @IBAction func showTimeTravelWindow(_ sender: AnyObject?) {

diff --git a/Screenshot Framer/Model/LayerStateHistory.swift b/Screenshot Framer/Model/LayerStateHistory.swift
@@ -57,6 +57,14 @@ final class LayerStateHistory {
         self.notifyLayerStateDidChange()
     }
 
+    @discardableResult func discardRedoHistory() -> Bool {
+        guard self.currentStackPosition < self.layerStates.count - 1 else { return false }
+
+        let delta = (self.layerStates.count - 1) - self.currentStackPosition
+        self.layerStates.removeLast(delta)
+        return true
+    }
+
 
     // MARK: - Undo / Redo
 

diff --git a/Screenshot Framer/Supporting Files/Info.plist b/Screenshot Framer/Supporting Files/Info.plist
@@ -40,7 +40,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.1</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>3</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>