Move from splited rectangles @ Magnifier to a Grid

KennethGomez · Feb 26, 2021 · 1cec683 · 1cec683
1 parent a4cae57
commit 1cec683
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 37 deletions.
diff --git a/LiveShot.API/Drawing/Tools/EyeDropperTool.cs b/LiveShot.API/Drawing/Tools/EyeDropperTool.cs
@@ -1,4 +1,6 @@
-using System.Windows;
+using System;
+using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Shapes;
@@ -8,16 +10,79 @@ namespace LiveShot.API.Drawing.Tools
 {
     public class EyeDropperTool : DrawingTool
     {
-        private readonly Rectangle?[,] _magnifier = new Rectangle[MagnifierSize * 2 + 1, MagnifierSize * 2 + 1];
+        private readonly Rectangle[,] _magnifier;
+        private readonly Grid _magnifierGrid;
 
         private const int MagnifierSize = 3;
+        private const int MagnifierRectangleSize = MagnifierSize * 2;
+        private const int MagnifierRealSize = MagnifierSize * 2 + 1;
         private const int ScreenShotStride = 4;
 
         private readonly ILiveShotService _liveShotService;
 
         public EyeDropperTool(ILiveShotService liveShotService)
         {
             _liveShotService = liveShotService;
+
+            _magnifier = GetMagnifier();
+            _magnifierGrid = GetMagnifierGrid();
+
+            InitMagnifier();
+        }
+
+        private void InitMagnifier()
+        {
+            for (var i = 0; i < _magnifier.GetLength(0); i++)
+            {
+                for (var j = 0; j < _magnifier.GetLength(1); j++)
+                {
+                    _magnifier[i, j].MouseUp += OnRectangleMouseUp;
+
+                    _magnifierGrid.Children.Add(_magnifier[i, j]);
+
+                    Grid.SetRow(_magnifier[i, j], j);
+                    Grid.SetColumn(_magnifier[i, j], i);
+                }
+            }
+        }
+
+        private Rectangle[,] GetMagnifier()
+        {
+            var magnifier = new Rectangle[MagnifierRealSize, MagnifierRealSize];
+
+            for (var i = 0; i < magnifier.GetLength(0); i++)
+            {
+                for (var j = 0; j < magnifier.GetLength(1); j++)
+                {
+                    magnifier[i, j] = new Rectangle
+                    {
+                        Width = MagnifierSize * 2,
+                        Height = MagnifierSize * 2
+                    };
+                }
+            }
+
+            return magnifier;
+        }
+
+        private Grid GetMagnifierGrid()
+        {
+            Grid grid = new();
+
+            for (var i = 0; i < MagnifierRealSize; i++)
+            {
+                grid.RowDefinitions.Add(new RowDefinition
+                {
+                    Height = new GridLength(MagnifierRectangleSize)
+                });
+
+                grid.ColumnDefinitions.Add(new ColumnDefinition
+                {
+                    Width = new GridLength(MagnifierRectangleSize)
+                });
+            }
+
+            return grid;
         }
 
         public override CanvasTool Tool => CanvasTool.EyeDropper;
@@ -29,6 +94,9 @@ _liveShotService.ScreenShotBytes is null ||
                 _liveShotService.DrawCanvas is not { } canvas
             ) return null;
 
+            if (!canvas.Children.Contains(_magnifierGrid))
+                canvas.Children.Add(_magnifierGrid);
+
             var point = e.GetPosition(canvas);
 
             var pixelIdx = (int) (
@@ -51,49 +119,25 @@ _liveShotService.DrawCanvas is not { } canvas
                     byte g = _liveShotService.ScreenShotBytes[rectIdx + 1];
                     byte r = _liveShotService.ScreenShotBytes[rectIdx + 2];
 
-                    if (_magnifier[i, j] is not { } rect)
-                    {
-                        rect = new Rectangle
-                        {
-                            Width = MagnifierSize * 2,
-                            Height = MagnifierSize * 2
-                        };
-
-                        _magnifier[i, j] = rect;
-
-                        rect.MouseUp += OnRectangleMouseUp;
-
-                        canvas.Children.Add(rect);
-                    }
-
-                    rect.Fill = new SolidColorBrush(Color.FromRgb(r, g, b));
-
-
-                    double left = point.X + (i - MagnifierSize) * MagnifierSize * 2;
-                    double top = point.Y + (j - MagnifierSize) * MagnifierSize * 2;
-
-                    System.Windows.Controls.Canvas.SetLeft(rect, left);
-                    System.Windows.Controls.Canvas.SetTop(rect, top);
+                    _magnifier[i, j].Fill = new SolidColorBrush(Color.FromRgb(r, g, b));
                 }
             }
 
+            double left = Math.Floor(point.X - _magnifierGrid.ActualWidth / 2);
+            double top = Math.Floor(point.Y - _magnifierGrid.ActualHeight / 2);
+
+            System.Windows.Controls.Canvas.SetLeft(_magnifierGrid, left);
+            System.Windows.Controls.Canvas.SetTop(_magnifierGrid, top);
+
             return null;
         }
 
         private void RemoveMagnifier()
         {
-            for (var i = 0; i < _magnifier.GetLength(0); i++)
-            {
-                for (var j = 0; j < _magnifier.GetLength(1); j++)
-                {
-                    if (_magnifier[i, j] is not {Parent: AbstractDrawCanvas canvas})
-                        continue;
+            if (_magnifierGrid is not {Parent: AbstractDrawCanvas canvas})
+                return;
 
-                    canvas.Children.Remove(_magnifier[i, j]);
-
-                    _magnifier[i, j] = null;
-                }
-            }
+            canvas.Children.Remove(_magnifierGrid);
         }
 
         private void OnRectangleMouseUp(object sender, MouseButtonEventArgs _)

diff --git a/LiveShot.UI.Controls/Canvas/DrawCanvas.cs b/LiveShot.UI.Controls/Canvas/DrawCanvas.cs
@@ -24,7 +24,7 @@ public class DrawCanvas : AbstractDrawCanvas
 
         private readonly IList<UIElement> _history;
         private readonly Cursor[] _highlightCursors;
-        private readonly Cursor _eyeDropperCursor = GetCursor<Rectangle>(Brushes.White, 1, false, 1, new Point(0, 0));
+        private readonly Cursor _eyeDropperCursor = GetCursor<Rectangle>(Brushes.White, 1, false, 1, new Point(0.5, 0.5));
 
         private Cursor[] _cursors;
         private int _drawingStrokeThickness = 1;