[WIP] 修改撤回行为

WXRIW · Mar 24, 2024 · df9c509 · df9c509
1 parent 6448bfe
commit df9c509
Show file tree

Hide file tree

Showing 3 changed files with 209 additions and 587 deletions.
diff --git a/Ink Canvas/Helpers/TimeMachine.cs b/Ink Canvas/Helpers/TimeMachine.cs
@@ -1,5 +1,7 @@
 using System.Collections.Generic;
+using System.Windows;
 using System.Windows.Ink;
+using System.Windows.Media;
 
 namespace Ink_Canvas.Helpers
 {
@@ -42,16 +44,16 @@ public void CommitStrokeShapeHistory(StrokeCollection strokeToBeReplaced, Stroke
             NotifyUndoRedoState();
         }
 
-        public void CommitStrokeManipulationHistory(StrokeCollection strokeToBeReplaced, StrokeCollection generatedStroke)
+        public void CommitStrokeManipulationHistory(StrokeCollection manipulatedStrokes, Matrix matrix)
         {
             if (_currentIndex + 1 < _currentStrokeHistory.Count)
             {
                 _currentStrokeHistory.RemoveRange(_currentIndex + 1, (_currentStrokeHistory.Count - 1) - _currentIndex);
             }
-            _currentStrokeHistory.Add(new TimeMachineHistory(generatedStroke,
-                TimeMachineHistoryType.Manipulation,
-                false,
-                strokeToBeReplaced));
+            _currentStrokeHistory.Add(
+                new TimeMachineHistory(manipulatedStrokes,
+                    TimeMachineHistoryType.Manipulation,
+                    matrix));
             _currentIndex = _currentStrokeHistory.Count - 1;
             NotifyUndoRedoState();
         }
@@ -122,6 +124,7 @@ public class TimeMachineHistory
         public bool StrokeHasBeenCleared;
         public StrokeCollection CurrentStroke;
         public StrokeCollection ReplacedStroke;
+        public Matrix ManipulationHistory;
         public TimeMachineHistory(StrokeCollection currentStroke, TimeMachineHistoryType commitType, bool strokeHasBeenCleared)
         {
             CommitType = commitType;
@@ -136,6 +139,12 @@ public TimeMachineHistory(StrokeCollection currentStroke, TimeMachineHistoryType
             StrokeHasBeenCleared = strokeHasBeenCleared;
             ReplacedStroke = replacedStroke;
         }
+        public TimeMachineHistory(StrokeCollection currentStroke, TimeMachineHistoryType commitType, Matrix matrix)
+        {
+            CommitType=commitType;
+            CurrentStroke = currentStroke;
+            ManipulationHistory = matrix;
+        }
     }
 
     public enum TimeMachineHistoryType

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
@@ -98,7 +98,6 @@
                    ManipulationDelta="Main_Grid_ManipulationDelta"
                    ManipulationCompleted="Main_Grid_ManipulationCompleted"
                    ManipulationInertiaStarting="inkCanvas_ManipulationInertiaStarting"
-                   ManipulationStarted="inkCanvas_ManipulationStarted"
                    IsManipulationEnabled="True"
                    EditingModeChanged="inkCanvas_EditingModeChanged"
                    PreviewTouchDown="inkCanvas_PreviewTouchDown"