[#27]Screenshot cancels event issue fix

[#27]Pressing Esc or right mouse button while taking a screenshot will not trigger the cancellation event fix
WPFDevelopersOrg · Feb 18, 2023 · 5125c8a · 5125c8a
1 parent 766bb2a
commit 5125c8a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/WPFDevelopers.Samples/WPFDevelopers.Samples.csproj b/src/WPFDevelopers.Samples/WPFDevelopers.Samples.csproj
@@ -101,7 +101,7 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="WPFDevelopers, Version=1.1.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\WPFDevelopers.1.1.0.1-preview\lib\net40\WPFDevelopers.dll</HintPath>
+      <HintPath>..\packages\WPFDevelopers.1.1.0.1-preview1\lib\net40\WPFDevelopers.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/WPFDevelopers.Samples/packages.config b/src/WPFDevelopers.Samples/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="WPFDevelopers" version="1.1.0.1-preview" targetFramework="net40" />
+  <package id="WPFDevelopers" version="1.1.0.1-preview1" targetFramework="net40" />
 </packages>
diff --git a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs
@@ -319,7 +319,7 @@ private Bitmap CopyScreen()
         }
         protected override void OnPreviewMouseRightButtonDown(MouseButtonEventArgs e)
         {
-            Close();
+            OnCanceled();
         }
 
         private void _radioButtonInk_Click(object sender, RoutedEventArgs e)
@@ -456,17 +456,20 @@ private CroppedBitmap CutBitmap()
         }
 
         private void _buttonCancel_Click(object sender, RoutedEventArgs e)
+        {
+            OnCanceled();
+        }
+        void OnCanceled()
         {
             Close();
             if (CutCanceled != null)
                 CutCanceled();
         }
-
         protected override void OnPreviewKeyDown(KeyEventArgs e)
         {
             if (e.Key == Key.Escape)
             {
-                Close();
+                OnCanceled();
             }
             else if (e.Key == Key.Delete)
             {