[fix] CommitStrokeManipulationHistory in TimeMachine

InkCanvas · Aug 9, 2024 · 4f2f4bf · 4f2f4bf
1 parent dc4248e
commit 4f2f4bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs b/Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs
@@ -197,18 +197,18 @@ private void MatrixTransform(int type)
                     break;
             }
 
-            StrokeCollection targetStrokes = inkCanvas.GetSelectedStrokes();
-            foreach (Stroke stroke in targetStrokes)
-            {
-                stroke.Transform(m, false);
-            }
-
             List<UIElement> selectedElements = InkCanvasElementsHelper.GetSelectedElements(inkCanvas);
             foreach (UIElement element in selectedElements)
             {
                 ApplyElementMatrixTransform(element, m);
             }
 
+            StrokeCollection targetStrokes = inkCanvas.GetSelectedStrokes();
+            foreach (Stroke stroke in targetStrokes)
+            {
+                stroke.Transform(m, false);
+            }
+
             if (DrawingAttributesHistory.Count > 0)
             {
                 timeMachine.CommitStrokeDrawingAttributesHistory(DrawingAttributesHistory);

diff --git a/Ink Canvas/MainWindow_cs/MW_TimeMachine.cs b/Ink Canvas/MainWindow_cs/MW_TimeMachine.cs
@@ -400,6 +400,10 @@ private void Stroke_StylusPointsChanged(object sender, EventArgs e)
 
         private void ToCommitStrokeManipulationHistoryAfterMouseUp()
         {
+            if (StrokeManipulationHistory == null && ElementsManipulationHistory == null)
+            {
+                return;
+            }
             timeMachine.CommitStrokeManipulationHistory(StrokeManipulationHistory, ElementsManipulationHistory);
             if (StrokeManipulationHistory != null)
             {