adjust cursors on crop

TheJoeFin · May 4, 2024 · 3ce1a09 · 3ce1a09
1 parent 2057db5
commit 3ce1a09
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 24 deletions.
diff --git a/MainWindow.xaml b/MainWindow.xaml
@@ -35,7 +35,7 @@
 
         <wpfui:TitleBar
             x:Name="wpfuiTitleBar"
-            Title="Magick Crop by TheJoeFin v1.2.1"
+            Title="Magick Crop by TheJoeFin v1.3.0"
             Height="32"
             Foreground="{wpfui:ThemeResource TextFillColorPrimaryBrush}">
             <wpfui:TitleBar.Resources>
@@ -259,6 +259,10 @@
                                         Name="CropImage"
                                         Click="CropImage_Click"
                                         Header="Crop Image" />
+                                    <MenuItem
+                                        Name="PerspectiveCorrectionMenuItem"
+                                        Click="PerspectiveCorrectionMenuItem_Click"
+                                        Header="Perspective Correction" />
                                 </ContextMenu>
                             </wpfui:DropDownButton.Flyout>
                             <wpfui:SymbolIcon Symbol="ImageEdit24" />

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -7,7 +7,6 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using Wpf.Ui;
 using Wpf.Ui.Appearance;
@@ -32,6 +31,7 @@ public partial class MainWindow : FluentWindow
     private string openedFileName = string.Empty;
 
     private List<UIElement> _polygonElements;
+    private Visibility _perspectiveHandlesState = Visibility.Visible;
 
     public MainWindow()
     {
@@ -130,7 +130,6 @@ private void PanCanvas(MouseEventArgs e)
         mat.Translate(deltaX, deltaY);
         matTrans.Matrix = mat;
         e.Handled = true;
-        Debug.WriteLine($"scaleFactor: {scaleFactor}");
     }
 
     private void MovePolyline(Point newPoint)
@@ -449,7 +448,6 @@ private void ShapeCanvas_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
 
         scaleFactor = e.Delta > 0 ? 1.1 : 1 / 1.1;
 
-        Debug.WriteLine($"scaleFactor: {scaleFactor}");
         Matrix mat = matTrans.Matrix;
         mat.ScaleAt(scaleFactor, scaleFactor, pos1.X, pos1.Y);
         matTrans.Matrix = mat;
@@ -771,6 +769,8 @@ private void CropImage_Click(object sender, RoutedEventArgs e)
         ApplySaveSplitButton.Visibility = Visibility.Collapsed;
         CropButtonPanel.Visibility = Visibility.Visible;
 
+        _perspectiveHandlesState = TopLeft.Visibility;
+
         foreach (UIElement element in _polygonElements)
             element.Visibility = Visibility.Collapsed;
 
@@ -779,12 +779,6 @@ private void CropImage_Click(object sender, RoutedEventArgs e)
 
     private async void ApplyCropButton_Click(object sender, RoutedEventArgs e)
     {
-        CropButtonPanel.Visibility = Visibility.Collapsed;
-        ApplySaveSplitButton.Visibility = Visibility.Visible;
-
-        foreach (UIElement element in _polygonElements)
-            element.Visibility = Visibility.Visible;
-
         if (string.IsNullOrEmpty(imagePath))
             return;
 
@@ -805,8 +799,14 @@ private async void ApplyCropButton_Click(object sender, RoutedEventArgs e)
 
         MainImage.Source = magickImage.ToBitmapSource();
 
-        CroppingRectangle.Visibility = Visibility.Collapsed;
         SetUiForCompletedTask();
+
+        foreach (UIElement element in _polygonElements)
+            element.Visibility = _perspectiveHandlesState;
+
+        CropButtonPanel.Visibility = Visibility.Collapsed;
+        ApplySaveSplitButton.Visibility = Visibility.Visible;
+        CroppingRectangle.Visibility = Visibility.Collapsed;
     }
 
     private void CancelCrop_Click(object sender, RoutedEventArgs e)
@@ -815,9 +815,19 @@ private void CancelCrop_Click(object sender, RoutedEventArgs e)
         ApplySaveSplitButton.Visibility = Visibility.Visible;
 
         foreach (UIElement element in _polygonElements)
-            element.Visibility = Visibility.Visible;
+            element.Visibility = _perspectiveHandlesState;
+
+        CroppingRectangle.Visibility = Visibility.Collapsed;
+    }
 
+    private void PerspectiveCorrectionMenuItem_Click(object sender, RoutedEventArgs e)
+    {
         CroppingRectangle.Visibility = Visibility.Collapsed;
+
+        Visibility newState = TopLeft.Visibility == Visibility.Visible ? Visibility.Collapsed : Visibility.Visible;
+
+        foreach (UIElement element in _polygonElements)
+            element.Visibility = newState;
     }
 }
 

diff --git a/ResizableRectangle.xaml b/ResizableRectangle.xaml
@@ -25,7 +25,7 @@
     <Grid>
         <Rectangle
             x:Name="rectangle"
-            Cursor="ScrollAll"
+            Cursor="SizeAll"
             Fill="Transparent"
             MouseDown="element_MouseDown"
             Stroke="Blue"
@@ -37,31 +37,31 @@
             Margin="-5,-5,0,0"
             HorizontalAlignment="Left"
             VerticalAlignment="Top"
-            Cursor="ScrollNW"
+            Cursor="SizeNWSE"
             Fill="Blue"
             MouseDown="element_MouseDown"
             Tag="TopLeft" />
         <Ellipse
             Margin="0,-5,-5,0"
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
-            Cursor="ScrollNE"
+            Cursor="SizeNESW"
             Fill="Blue"
             MouseDown="element_MouseDown"
             Tag="TopRight" />
         <Ellipse
             Margin="0,0,-5,-5"
             HorizontalAlignment="Right"
             VerticalAlignment="Bottom"
-            Cursor="ScrollSE"
+            Cursor="SizeNWSE"
             Fill="Blue"
             MouseDown="element_MouseDown"
             Tag="BottomRight" />
         <Ellipse
             Margin="-5,0,0,-5"
             HorizontalAlignment="Left"
             VerticalAlignment="Bottom"
-            Cursor="ScrollSW"
+            Cursor="SizeNESW"
             Fill="Blue"
             MouseDown="element_MouseDown"
             Tag="BottomLeft" />
@@ -72,7 +72,7 @@
             Margin="0,-3,0,0"
             HorizontalAlignment="Center"
             VerticalAlignment="Top"
-            Cursor="ScrollNS"
+            Cursor="SizeNS"
             Fill="Blue"
             MouseDown="element_MouseDown"
             RadiusX="4"
@@ -86,7 +86,7 @@
             Margin="0,0,-3,0"
             HorizontalAlignment="Right"
             VerticalAlignment="Center"
-            Cursor="ScrollWE"
+            Cursor="SizeWE"
             Fill="Blue"
             MouseDown="element_MouseDown"
             RadiusX="4"
@@ -100,7 +100,7 @@
             Margin="0,0,0,-3"
             HorizontalAlignment="Center"
             VerticalAlignment="Bottom"
-            Cursor="ScrollNS"
+            Cursor="SizeNS"
             Fill="Blue"
             MouseDown="element_MouseDown"
             RadiusX="4"
@@ -114,7 +114,7 @@
             Margin="-3,0,0,0"
             HorizontalAlignment="Left"
             VerticalAlignment="Center"
-            Cursor="ScrollWE"
+            Cursor="SizeWE"
             Fill="Blue"
             MouseDown="element_MouseDown"
             RadiusX="4"

diff --git a/ResizableRectangle.xaml.cs b/ResizableRectangle.xaml.cs
@@ -1,5 +1,4 @@
 using ImageMagick;
-using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -54,8 +53,6 @@ private void UserControl_MouseMove(object sender, MouseEventArgs e)
         double canvasDeltaX = position.X - MouseDownCanvasPoint.Value.X;
         double canvasDeltaY = position.Y - MouseDownCanvasPoint.Value.Y;
 
-        Debug.WriteLine($"canvasDeltaX = {canvasDeltaX}, canvasDeltaY = {canvasDeltaY}");
-
         switch (KindOfMove)
         {
             case MovingKind.Pan: