From 8926d113ccced604161a980c5c35a8ea197f3fed Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Sat, 25 Jun 2016 10:55:32 +0300
Subject: [PATCH] Don't store move speed in region capture options

---
 .../RegionCaptureOptions.cs                   |  4 +--
 .../Shapes/ResizeManager.cs                   | 34 ++++++++-----------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/ShareX.ScreenCaptureLib/RegionCaptureOptions.cs b/ShareX.ScreenCaptureLib/RegionCaptureOptions.cs
index 43dbcd625..9ad67eb05 100644
--- a/ShareX.ScreenCaptureLib/RegionCaptureOptions.cs
+++ b/ShareX.ScreenCaptureLib/RegionCaptureOptions.cs
@@ -49,6 +49,7 @@ public class RegionCaptureOptions
             new SnapSize(1280, 720), // 720p
             new SnapSize(1920, 1080) // 1080p
         };
+        public int SnapDistance = 30;
 
         public AnnotationOptions AnnotationOptions = new AnnotationOptions();
         public bool ShowTips = true;
@@ -65,8 +66,5 @@ public class RegionCaptureOptions
         public ShapeType LastRegionTool = ShapeType.RegionRectangle;
         public ShapeType LastAnnotationTool = ShapeType.DrawingRectangle;
         public bool ShowMenuTip = true;
-        public int MinMoveSpeed = 1;
-        public int MaxMoveSpeed = 10;
-        public int SnapDistance = 20;
     }
 }
\ No newline at end of file
diff --git a/ShareX.ScreenCaptureLib/Shapes/ResizeManager.cs b/ShareX.ScreenCaptureLib/Shapes/ResizeManager.cs
index 827dcc879..f2a40160c 100644
--- a/ShareX.ScreenCaptureLib/Shapes/ResizeManager.cs
+++ b/ShareX.ScreenCaptureLib/Shapes/ResizeManager.cs
@@ -32,6 +32,9 @@ namespace ShareX.ScreenCaptureLib
 {
     public class ResizeManager
     {
+        public const int MinMoveSpeed = 1;
+        public const int MaxMoveSpeed = 10;
+
         private bool visible;
 
         public bool Visible
@@ -76,26 +79,17 @@ public bool Visible
         }
 
         public bool IsResizing { get; private set; }
-        public int MaxMoveSpeed { get; set; }
-        public int MinMoveSpeed { get; set; }
         public bool IsBottomRightResizing { get; set; }
 
-        private bool IsUpPressed { get; set; }
-        private bool IsDownPressed { get; set; }
-        private bool IsLeftPressed { get; set; }
-        private bool IsRightPressed { get; set; }
-
         private ShapeManager shapeManager;
         private NodeObject[] nodes;
+        private bool isUpPressed, isDownPressed, isLeftPressed, isRightPressed;
         private Rectangle tempRect;
 
         public ResizeManager(BaseRegionForm form, ShapeManager shapeManager)
         {
             this.shapeManager = shapeManager;
 
-            MinMoveSpeed = form.Config.MinMoveSpeed;
-            MaxMoveSpeed = form.Config.MaxMoveSpeed;
-
             form.KeyDown += form_KeyDown;
             form.KeyUp += form_KeyUp;
 
@@ -202,16 +196,16 @@ private void form_KeyDown(object sender, KeyEventArgs e)
             switch (e.KeyCode)
             {
                 case Keys.Up:
-                    IsUpPressed = true;
+                    isUpPressed = true;
                     break;
                 case Keys.Down:
-                    IsDownPressed = true;
+                    isDownPressed = true;
                     break;
                 case Keys.Left:
-                    IsLeftPressed = true;
+                    isLeftPressed = true;
                     break;
                 case Keys.Right:
-                    IsRightPressed = true;
+                    isRightPressed = true;
                     break;
                 case Keys.Menu:
                     IsBottomRightResizing = true;
@@ -220,8 +214,8 @@ private void form_KeyDown(object sender, KeyEventArgs e)
 
             // Calculate cursor movement
             int speed = e.Shift ? MaxMoveSpeed : MinMoveSpeed;
-            int y = IsUpPressed && IsDownPressed ? 0 : IsDownPressed ? speed : IsUpPressed ? -speed : 0;
-            int x = IsLeftPressed && IsRightPressed ? 0 : IsRightPressed ? speed : IsLeftPressed ? -speed : 0;
+            int y = isUpPressed && isDownPressed ? 0 : isDownPressed ? speed : isUpPressed ? -speed : 0;
+            int x = isLeftPressed && isRightPressed ? 0 : isRightPressed ? speed : isLeftPressed ? -speed : 0;
 
             // Move the cursor
             if (shapeManager.CurrentShape == null || shapeManager.IsCreating)
@@ -246,16 +240,16 @@ private void form_KeyUp(object sender, KeyEventArgs e)
             switch (e.KeyCode)
             {
                 case Keys.Up:
-                    IsUpPressed = false;
+                    isUpPressed = false;
                     break;
                 case Keys.Down:
-                    IsDownPressed = false;
+                    isDownPressed = false;
                     break;
                 case Keys.Left:
-                    IsLeftPressed = false;
+                    isLeftPressed = false;
                     break;
                 case Keys.Right:
-                    IsRightPressed = false;
+                    isRightPressed = false;
                     break;
                 case Keys.Menu:
                     IsBottomRightResizing = false;