From 0b798cea4f4794cb584a20555f51c01dc6b42904 Mon Sep 17 00:00:00 2001
From: kriastans <kriastans@protonmail.com>
Date: Sun, 5 May 2024 13:11:40 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=BE=A9=E9=BC=A0=E6=A8=99?=
 =?UTF-8?q?=E7=9A=84=E5=BD=A2=E7=8B=80=E7=B9=AA=E8=A3=BDBug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/Ink Canvas.csproj                  |   4 +
 Ink Canvas/MainWindow.xaml                    |   8 +-
 .../MainWindow_cs/MW_FloatingBarIcons.cs      |   2 +
 Ink Canvas/MainWindow_cs/MW_Hotkeys.cs        |   2 +-
 .../MainWindow_cs/MW_SelectionGestures.cs     |  12 +-
 Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs   | 275 ++++++++++++++----
 Ink Canvas/Resources/new-icons/redo.png       | Bin 0 -> 1170 bytes
 Ink Canvas/Resources/new-icons/undo.png       | Bin 0 -> 1126 bytes
 8 files changed, 245 insertions(+), 58 deletions(-)
 create mode 100644 Ink Canvas/Resources/new-icons/redo.png
 create mode 100644 Ink Canvas/Resources/new-icons/undo.png

diff --git a/Ink Canvas/Ink Canvas.csproj b/Ink Canvas/Ink Canvas.csproj
index 995fa7e..1ee7e6a 100644
--- a/Ink Canvas/Ink Canvas.csproj	
+++ b/Ink Canvas/Ink Canvas.csproj	
@@ -632,5 +632,9 @@
   <ItemGroup>
     <Resource Include="Resources\Icons-Fluent\party.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\new-icons\redo.png" />
+    <Resource Include="Resources\new-icons\undo.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 9b499ea..86e3bdd 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -1867,12 +1867,12 @@
                                     </ui:SimpleStackPanel>
                                 </Border>
                             </Grid>
-                            <ui:SimpleStackPanel MouseDown="Border_MouseDown" MouseUp="SymbolIconUndo_MouseUp" Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Margin="0,-2" IsEnabled="{Binding ElementName=BtnUndo, Path=IsEnabled}" Width="28">
-                                <Image Source="/Resources/Icons-png/undo.png" RenderOptions.BitmapScalingMode="HighQuality" Width="28" Opacity="{Binding ElementName=BtnUndo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}" Height="17" Margin="0,3,0,0"/>
+                            <ui:SimpleStackPanel MouseLeave="FloatingBarIcons_MouseUp_MouseLeave" MouseDown="FloatingBarIcons_MouseDown_New" MouseUp="SymbolIconUndo_MouseUp" IsHitTestVisible="{Binding ElementName=BtnUndo, Path=IsEnabled}" Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Margin="0,-2" IsEnabled="{Binding ElementName=BtnUndo, Path=IsEnabled}" Width="28">
+                                <Image Source="/Resources/new-icons/undo.png" RenderOptions.BitmapScalingMode="HighQuality" Width="28" Opacity="{Binding ElementName=BtnUndo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}" Height="17" Margin="0,3,0,0"/>
                                 <TextBlock x:Name="UndoToolbarTextBlock" Text="撤销" Opacity="{Binding ElementName=BtnUndo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}" Foreground="Black"  FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
                             </ui:SimpleStackPanel>
-                            <ui:SimpleStackPanel MouseDown="Border_MouseDown" MouseUp="SymbolIconRedo_MouseUp" Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" IsEnabled="{Binding ElementName=BtnRedo, Path=IsEnabled}" Width="28" Margin="0,-2">
-                                <Image Source="/Resources/Icons-png/redo.png" RenderOptions.BitmapScalingMode="HighQuality" Width="28" Opacity="{Binding ElementName=BtnRedo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}" Height="17" Margin="0,3,0,0"/>
+                            <ui:SimpleStackPanel MouseLeave="FloatingBarIcons_MouseUp_MouseLeave" MouseDown="FloatingBarIcons_MouseDown_New" MouseUp="SymbolIconRedo_MouseUp" IsHitTestVisible="{Binding ElementName=BtnUndo, Path=IsEnabled}" Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" IsEnabled="{Binding ElementName=BtnRedo, Path=IsEnabled}" Width="28" Margin="0,-2">
+                                <Image Source="/Resources/new-icons/redo.png" RenderOptions.BitmapScalingMode="HighQuality" Width="28" Opacity="{Binding ElementName=BtnRedo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}" Height="17" Margin="0,3,0,0"/>
                                 <TextBlock x:Name="RedoToolbarTextBlock" Text="重做" Opacity="{Binding ElementName=BtnRedo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}" Foreground="Black"  FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
                             </ui:SimpleStackPanel>
                             <ui:SimpleStackPanel MouseLeave="FloatingBarIcons_MouseUp_MouseLeave" MouseDown="FloatingBarIcons_MouseDown_New" MouseUp="CursorWithDelIcon_Click"
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index bcc2e32..4ea1588 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
@@ -309,6 +309,7 @@ namespace Ink_Canvas {
 
         private void SymbolIconUndo_MouseUp(object sender, MouseButtonEventArgs e) {
             if (lastBorderMouseDownObject != sender) return;
+            FloatingBarIcons_MouseUp_New(sender);
             if (!BtnUndo.IsEnabled) return;
             BtnUndo_Click(BtnUndo, null);
             HideSubPanels();
@@ -316,6 +317,7 @@ namespace Ink_Canvas {
 
         private void SymbolIconRedo_MouseUp(object sender, MouseButtonEventArgs e) {
             if (lastBorderMouseDownObject != sender) return;
+            FloatingBarIcons_MouseUp_New(sender);
             if (!BtnRedo.IsEnabled) return;
             BtnRedo_Click(BtnRedo, null);
             HideSubPanels();
diff --git a/Ink Canvas/MainWindow_cs/MW_Hotkeys.cs b/Ink Canvas/MainWindow_cs/MW_Hotkeys.cs
index 839c04b..3bacf50 100644
--- a/Ink Canvas/MainWindow_cs/MW_Hotkeys.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Hotkeys.cs	
@@ -91,7 +91,7 @@ namespace Ink_Canvas {
 
         private void KeyDrawLine(object sender, ExecutedRoutedEventArgs e) {
             if (StackPanelCanvasControls.Visibility == Visibility.Visible) {
-                BtnDrawLine_Click(lastMouseDownSender, e);
+                BtnDrawLine_Click(lastMouseDownSender, null);
             }
         }
 
diff --git a/Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs b/Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs
index d8c67ba..8a61ef9 100644
--- a/Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs	
@@ -24,12 +24,18 @@ namespace Ink_Canvas {
             SimpleStackPanel ssp = sender as SimpleStackPanel;
             if (ssp!=null)
             {
-                if ((ssp.Name== "Pen_Icon"&&inkCanvas.EditingMode == InkCanvasEditingMode.Ink)|| (ssp.Name == "Eraser_Icon" && inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) || (ssp.Name == "EraserByStrokes_Icon" && inkCanvas.EditingMode == InkCanvasEditingMode.EraseByStroke) || (ssp.Name == "SymbolIconSelect" && inkCanvas.EditingMode == InkCanvasEditingMode.Select))
+                if ((ssp.Name == "Pen_Icon" && inkCanvas.EditingMode == InkCanvasEditingMode.Ink) || (ssp.Name == "Eraser_Icon" && inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) || (ssp.Name == "EraserByStrokes_Icon" && inkCanvas.EditingMode == InkCanvasEditingMode.EraseByStroke) || (ssp.Name == "SymbolIconSelect" && inkCanvas.EditingMode == InkCanvasEditingMode.Select))
                 {
                     ssp.Background = new ImageBrush(new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/check-box-background.png"))) { Opacity = 1 };
-                } else
+                }
+                else if (ssp.Name == "SymbolIconDelete")
                 {
-                    ssp.Background = new ImageBrush(new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/pressdown-background.png"))) { Opacity = 1 };
+                    ssp.Background = new SolidColorBrush(Color.FromArgb(26, 153, 27, 27));
+                }
+                else
+                {
+                    // ssp.Background = new ImageBrush(new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/pressdown-background.png"))) { Opacity = 1 };
+                    ssp.Background = new SolidColorBrush(Color.FromArgb(20, 0,0,0));
                 }
             }
         }
diff --git a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
index 5927ab3..30b49f1 100644
--- a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs	
@@ -89,13 +89,20 @@ namespace Ink_Canvas {
             isLongPressSelected = false;
         }
 
-        private void BtnDrawLine_Click(object sender, EventArgs e) {
+        private void BtnDrawLine_Click(object sender, MouseButtonEventArgs e) {
             if (lastMouseDownSender == sender) {
                 forceEraser = true;
                 drawingShapeMode = 1;
                 inkCanvas.EditingMode = InkCanvasEditingMode.None;
                 inkCanvas.IsManipulationEnabled = true;
-                CancelSingleFingerDragMode(true);
+                if (e == null || e.StylusDevice == null)
+                { // e == null: 快捷键 alt + L
+                    CancelSingleFingerDragMode();
+                }
+                else
+                {
+                    CancelSingleFingerDragMode(true);
+                }
             }
             lastMouseDownSender = null;
             if (isLongPressSelected) {
@@ -108,13 +115,20 @@ namespace Ink_Canvas {
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawDashedLine_Click(object sender, EventArgs e) {
+        private void BtnDrawDashedLine_Click(object sender, MouseButtonEventArgs e) {
             if (lastMouseDownSender == sender) {
                 forceEraser = true;
                 drawingShapeMode = 8;
                 inkCanvas.EditingMode = InkCanvasEditingMode.None;
                 inkCanvas.IsManipulationEnabled = true;
-                CancelSingleFingerDragMode(true);
+                if (e.StylusDevice == null)
+                {
+                    CancelSingleFingerDragMode();
+                }
+                else
+                {
+                    CancelSingleFingerDragMode(true);
+                }
             }
             lastMouseDownSender = null;
             if (isLongPressSelected) {
@@ -127,13 +141,20 @@ namespace Ink_Canvas {
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawDotLine_Click(object sender, EventArgs e) {
+        private void BtnDrawDotLine_Click(object sender, MouseButtonEventArgs e) {
             if (lastMouseDownSender == sender) {
                 forceEraser = true;
                 drawingShapeMode = 18;
                 inkCanvas.EditingMode = InkCanvasEditingMode.None;
                 inkCanvas.IsManipulationEnabled = true;
-                CancelSingleFingerDragMode(true);
+                if (e.StylusDevice == null)
+                {
+                    CancelSingleFingerDragMode();
+                }
+                else
+                {
+                    CancelSingleFingerDragMode(true);
+                }
             }
             lastMouseDownSender = null;
             if (isLongPressSelected) {
@@ -146,13 +167,20 @@ namespace Ink_Canvas {
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawArrow_Click(object sender, EventArgs e) {
+        private void BtnDrawArrow_Click(object sender, MouseButtonEventArgs e) {
             if (lastMouseDownSender == sender) {
                 forceEraser = true;
                 drawingShapeMode = 2;
                 inkCanvas.EditingMode = InkCanvasEditingMode.None;
                 inkCanvas.IsManipulationEnabled = true;
-                CancelSingleFingerDragMode(true);
+                if (e.StylusDevice == null)
+                {
+                    CancelSingleFingerDragMode();
+                }
+                else
+                {
+                    CancelSingleFingerDragMode(true);
+                }
             }
             lastMouseDownSender = null;
             if (isLongPressSelected) {
@@ -165,13 +193,20 @@ namespace Ink_Canvas {
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawParallelLine_Click(object sender, EventArgs e) {
+        private void BtnDrawParallelLine_Click(object sender, MouseButtonEventArgs e) {
             if (lastMouseDownSender == sender) {
                 forceEraser = true;
                 drawingShapeMode = 15;
                 inkCanvas.EditingMode = InkCanvasEditingMode.None;
                 inkCanvas.IsManipulationEnabled = true;
-                CancelSingleFingerDragMode(true);
+                if (e.StylusDevice == null)
+                {
+                    CancelSingleFingerDragMode();
+                }
+                else
+                {
+                    CancelSingleFingerDragMode(true);
+                }
             }
             lastMouseDownSender = null;
             if (isLongPressSelected) {
@@ -184,180 +219,313 @@ namespace Ink_Canvas {
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawCoordinate1_Click(object sender, EventArgs e) {
+        private void BtnDrawCoordinate1_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 11;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawCoordinate2_Click(object sender, EventArgs e) {
+        private void BtnDrawCoordinate2_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 12;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawCoordinate3_Click(object sender, EventArgs e) {
+        private void BtnDrawCoordinate3_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 13;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawCoordinate4_Click(object sender, EventArgs e) {
+        private void BtnDrawCoordinate4_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 14;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawCoordinate5_Click(object sender, EventArgs e) {
+        private void BtnDrawCoordinate5_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 17;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawRectangle_Click(object sender, EventArgs e) {
+        private void BtnDrawRectangle_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 3;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawRectangleCenter_Click(object sender, EventArgs e) {
+        private void BtnDrawRectangleCenter_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 19;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawEllipse_Click(object sender, EventArgs e) {
+        private void BtnDrawEllipse_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 4;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode();
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawCircle_Click(object sender, EventArgs e) {
+        private void BtnDrawCircle_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 5;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode();
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawCenterEllipse_Click(object sender, EventArgs e) {
+        private void BtnDrawCenterEllipse_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 16;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawCenterEllipseWithFocalPoint_Click(object sender, EventArgs e) {
+        private void BtnDrawCenterEllipseWithFocalPoint_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 23;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawDashedCircle_Click(object sender, EventArgs e) {
+        private void BtnDrawDashedCircle_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 10;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawHyperbola_Click(object sender, EventArgs e) {
+        private void BtnDrawHyperbola_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 24;
             drawMultiStepShapeCurrentStep = 0;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawHyperbolaWithFocalPoint_Click(object sender, EventArgs e) {
+        private void BtnDrawHyperbolaWithFocalPoint_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 25;
             drawMultiStepShapeCurrentStep = 0;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawParabola1_Click(object sender, EventArgs e) {
+        private void BtnDrawParabola1_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 20;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawParabolaWithFocalPoint_Click(object sender, EventArgs e) {
+        private void BtnDrawParabolaWithFocalPoint_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 22;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawParabola2_Click(object sender, EventArgs e) {
+        private void BtnDrawParabola2_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 21;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawCylinder_Click(object sender, EventArgs e) {
+        private void BtnDrawCylinder_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 6;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawCone_Click(object sender, EventArgs e) {
+        private void BtnDrawCone_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 7;
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
-        private void BtnDrawCuboid_Click(object sender, EventArgs e) {
+        private void BtnDrawCuboid_Click(object sender, MouseButtonEventArgs e) {
             forceEraser = true;
             drawingShapeMode = 9;
             isFirstTouchCuboid = true;
@@ -365,7 +533,14 @@ namespace Ink_Canvas {
             CuboidFrontRectEndP = new Point();
             inkCanvas.EditingMode = InkCanvasEditingMode.None;
             inkCanvas.IsManipulationEnabled = true;
-            CancelSingleFingerDragMode(true);
+            if (e.StylusDevice == null)
+            {
+                CancelSingleFingerDragMode();
+            }
+            else
+            {
+                CancelSingleFingerDragMode(true);
+            }
             DrawShapePromptToPen();
         }
 
diff --git a/Ink Canvas/Resources/new-icons/redo.png b/Ink Canvas/Resources/new-icons/redo.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4ae2fe83b8e60a3845c5e1ceabf9468c745f35b
GIT binary patch
literal 1170
zcmV;D1a13?P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00009a7bBm001mY
z001mY0i`{bsQ>@~0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1Sd&EK~#7F?VL+a
z8$l3;%h*^*yd2noj1=btv3KmScUi&>-~_-fJDd~X8vrLrvdjvy%qnmKoCS|vES^R@
zoWG=DL(DuIcYEglq|sPRgFN+jS65ecBSHuvgb+dqA%qY@2qA<JLI@!wt>h#FRKWfH
z{Z1~ItM+=m60UE>VsWz##4@QDK#l+K@bFs=|Kd>xSL5X5<WMX!A}I&P-|l04MSr$m
zE|;rfk<^a>7`PYE#Og>${Rn{H?*uflIucSZ0NhWQo^4Hp)C=(V__!8g6ew0iNWB2(
z=jZK0q0n$ugiNdh6hxy{L`3_qL_{wc*u<O}0TdTS$dmwzYa(P$0L3K{GAV%KiU^q%
zKyg8YObejc79sNjC^khHm;eh43w7K+K0Q6@y*e^7QVRLPE@DiCHx&RqtAw7lfsgA$
zZ0y(QjE;`hk`{Fe@&<T@Z=wpdF6pJDRW{rkk^tiZAdj*E<8P&~$M+*~&d8_$@bfJg
zUfqpkgv6c9hydzxFdV<a@O8-$THKd}7!d%*-xmYJameT(qT7^&B(4Xj+mQ?!A6G+b
z4U&*VVJIftRor$W{7MJIwuPQ^fC5ST?Ck81IKWUY#JtT;>Ut_cZSi7l7=0Bz=BGG@
z?Nmf;7X;&PNeJV^@U5Ghn;MPZpI9Tn>;1<;?eJpF)6>&0;vlZ1qhm!uUhnrsdp>+T
zjUPZ<7gYCqs6PMp_LjyEL1Y2EtY*cp4I-Ro2Z&?1Sd@<}09?zG-*fH#_|kjg7_M$h
zi7Wu}_`ZuS6U%ecxN3YQvH*CAO2Bic1n|xWIB9$(vH<Y!6~E`*ZudwW!smRzO9pOy
zCC&)&eHqs#Uwq%?5Y4O@U*Y+HVLPA^^g{FV^Y6tW0?r3mHNFxj4D}TtpU-~~hwwQc
zVBPpioG{e)3kR(e294(IF%j1w!gF+{hChHXHQUBlA}8ap64sh;%cn^PFZNDIDB?`Q
zL1AXeOIMH(#7alQz<&e6(f0NAb<M?mkZa^61``t#WALeUpC+YZu{d^ldHF+#FR=ue
zot-_xWcxXw+2Zu{bnfEf;y}o&#1a6Wr8_k>r7mbOplMy(AvFDk6h&9ae<Uf&>;BK<
zka?CiuBMA=YTLvb0g8@-$;rt(eEbxmxr(%m(XfiE0@rjmGc%)ebmm7z;_d0>a(NrK
z4KavI|Ig>GF>*ctBIy30x|qet{(ILkk`0BSR&X=Dtbg8rpK6Q<fKICEhZ;V%#4J@w
zIY#RN5J7hfuW4ak%n&BR8fuIeWFW#W7HJKLuqz31vA}Pd*kPz2S65dZq#?eKkB{#m
zWud*e<lUp7`|nruZ%K+7*fG_)xw$3O66(6G#oJk-S3gnI;D=gBF|q%i5JCtcgb+dq
kA%qY@2qA<JLI|<NKS0``x;_V<k^lez07*qoM6N<$f+mI(CIA2c

literal 0
HcmV?d00001

diff --git a/Ink Canvas/Resources/new-icons/undo.png b/Ink Canvas/Resources/new-icons/undo.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcde28c262fd731541a171c06cdce17496f490e3
GIT binary patch
literal 1126
zcmV-s1eyDZP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00009a7bBm001mY
z001mY0i`{bsQ>@~0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1N%utK~#7F?VL|e
zTQLyECuxWf|CEXi0v6!}BsT~rD7`^B0pSF|34jwocipu&AUy%$23Y`M841CLKj}AZ
z=mNp>v!CCK<9t8KQlw`Vp3ffJGh;*uA%qY@2qA<JLI@#*5JCtcgv3fo0-z2aA0JOk
zrBY)!9M;f&Rjbv#9+1cxy8y6#<LT+?Tn+!`(_m(1rWv~kWf>z0##d^(DkO5oCV;{C
zuQVib#v(vU<141`6Hnm+SQuY)GnU9HQ~(>}gTc$o%br9|VFK71A8qUQ_O>UHQ^+yY
z#rW6P*Ik(cau<NcPbOCZXnZrd2|(kgBNqW^{PcJifX27Os{k~<J>CSM@!jwufTi(+
z19=F&b@%X7Ten;;|Gv7q>PP`(7C@6JF#g4)8b5&^S_e6a!#r~mpCls-3k#<(evDyb
zolp&|jP}yfQhj-O`EmfnGnoZgTwMGi@uNa)Lx{oM-QA^lBy%uM{ijR^b+og!wY4Mh
zNM-@xex~gt(_UR&y{G~4KxP4+pPzT8XchcLt2gH7=YNU^G7F$F`%0y<HEkk*mJfHt
zix^OMGCMoFiAl6QYW1{#t695#zke)_Fck3)nAzVjhW(U64DRpmH(ZaXUQ?2|uXHWk
zk&1MV!3KASz@#{<R;x|?Of$1<*bnx_5r(4;;KZXV;lR`ntKhTCD##@%AInNmZf<T4
zCB;gZo15De2Xd>5h)D#E2Vph$lKNnrZE+yivXodvz&HkoknR||)z;V7TVhG>bwRO+
zpy6rL7;q`w6iW&z%!)+>ocR;?0*tREmK0VQ=OTjU8YCbzQDf+0J!uN94Yd^^wD$ox
zTKAH^V_en&y27iYEky{*4W+164POAoLImppO&Vi+A(KXg(B21NOEOJ}FmA$WF^CY{
z`vB|#i7wG}S$mJM3ZSS67+4b`yv}wNqk}VbGqm>sFz^>cm!4QskpLJO`m2P`w&A;V
zKymCVU{cT=f&5F%e+XP=M=S~ArF`h<=8HSYg(L`|{vVOk4Y7nPAO+Z?4#Y6~K}Q^*
z00t1@JizQW#`@uY4#j~WHsKIax1%#Zjq%av%=N@Z0p3C5`lC2h-PBiozw7K*D1iL0
z@UG)$3vJh?(p&SzS?()SA;8=JNA&hPzKIK(AL#e{-z5XlA4Btczo0d-ICeHABhjCN
zVEm&T9*=Y$9v-&D1JSPl++c^|k&)Z+79@;*1$ZnP*63{8r}35O1@Q5HL1(?zf5P}D
z;+g1O(8|h69XSV=O?ZI6Ifk!4$>VL<D^n4S8;PKs@kilgHMSOC>1yd<<L=^YZ>oSG
sgb+dqA%qY@2qA<JLI@#*5JD390~sKIDjfzm3jhEB07*qoM6N<$f_UlkdH?_b

literal 0
HcmV?d00001