[fix] undefined about StrokeManipulationHistory, ElementsManipulation…

…History
InkCanvas · Aug 11, 2024 · dac62ac · dac62ac
1 parent 4f2f4bf
commit dac62ac
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 23 deletions.
diff --git a/Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs b/Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs
@@ -529,16 +529,22 @@ private void GridInkCanvasSelectionCover_ManipulationCompleted(object sender, Ma
             if (StrokeManipulationHistory?.Count > 0 || ElementsManipulationHistory?.Count > 0)
             {
                 timeMachine.CommitStrokeManipulationHistory(StrokeManipulationHistory, ElementsManipulationHistory);
-                foreach (var item in StrokeManipulationHistory)
+                if(StrokeManipulationHistory?.Count > 0)
                 {
-                    StrokeInitialHistory[item.Key] = item.Value.Item2;
+                    foreach (var item in StrokeManipulationHistory)
+                    {
+                        StrokeInitialHistory[item.Key] = item.Value.Item2;
+                    }
+                    StrokeManipulationHistory = null;
                 }
-                StrokeManipulationHistory = null;
-                foreach (var item in ElementsManipulationHistory)
+                if(ElementsManipulationHistory?.Count > 0)
                 {
-                    ElementsInitialHistory[item.Key] = item.Value.Item2;
+                    foreach (var item in ElementsManipulationHistory)
+                    {
+                        ElementsInitialHistory[item.Key] = item.Value.Item2;
+                    }
+                    ElementsManipulationHistory = null;
                 }
-                ElementsManipulationHistory = null;
             }
             if (DrawingAttributesHistory.Count > 0)
             {

diff --git a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
@@ -1615,16 +1615,22 @@ private void inkCanvas_MouseUp(object sender, MouseButtonEventArgs e)
             if (StrokeManipulationHistory?.Count > 0 || ElementsManipulationHistory?.Count > 0)
             {
                 timeMachine.CommitStrokeManipulationHistory(StrokeManipulationHistory, ElementsManipulationHistory);
-                foreach (var item in StrokeManipulationHistory)
+                if(StrokeManipulationHistory?.Count > 0)
                 {
-                    StrokeInitialHistory[item.Key] = item.Value.Item2;
+                    foreach (var item in StrokeManipulationHistory)
+                    {
+                        StrokeInitialHistory[item.Key] = item.Value.Item2;
+                    }
+                    StrokeManipulationHistory = null;
                 }
-                StrokeManipulationHistory = null;
-                foreach (var item in ElementsManipulationHistory)
+                if (ElementsManipulationHistory?.Count > 0)
                 {
-                    ElementsInitialHistory[item.Key] = item.Value.Item2;
+                    foreach (var item in ElementsManipulationHistory)
+                    {
+                        ElementsInitialHistory[item.Key] = item.Value.Item2;
+                    }
+                    ElementsManipulationHistory = null;
                 }
-                ElementsManipulationHistory = null;
             }
             if (DrawingAttributesHistory.Count > 0)
             {

diff --git a/Ink Canvas/MainWindow_cs/MW_TimeMachine.cs b/Ink Canvas/MainWindow_cs/MW_TimeMachine.cs
@@ -404,22 +404,25 @@ private void ToCommitStrokeManipulationHistoryAfterMouseUp()
             {
                 return;
             }
-            timeMachine.CommitStrokeManipulationHistory(StrokeManipulationHistory, ElementsManipulationHistory);
-            if (StrokeManipulationHistory != null)
+            if(StrokeManipulationHistory?.Count > 0 || ElementsManipulationHistory?.Count > 0)
             {
-                foreach (var item in StrokeManipulationHistory)
+                timeMachine.CommitStrokeManipulationHistory(StrokeManipulationHistory, ElementsManipulationHistory);
+                if (StrokeManipulationHistory != null)
                 {
-                    StrokeInitialHistory[item.Key] = item.Value.Item2;
+                    foreach (var item in StrokeManipulationHistory)
+                    {
+                        StrokeInitialHistory[item.Key] = item.Value.Item2;
+                    }
+                    StrokeManipulationHistory = null;
                 }
-                StrokeManipulationHistory = null;
-            }
-            if (ElementsManipulationHistory != null)
-            {
-                foreach (var item in ElementsManipulationHistory)
+                if (ElementsManipulationHistory != null)
                 {
-                    ElementsInitialHistory[item.Key] = item.Value.Item2;
+                    foreach (var item in ElementsManipulationHistory)
+                    {
+                        ElementsInitialHistory[item.Key] = item.Value.Item2;
+                    }
+                    ElementsManipulationHistory = null;
                 }
-                ElementsManipulationHistory = null;
             }
         }
     }