From 552c898864031da7e5bee7699eaae4024d3a6520 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Sun, 14 Apr 2019 10:17:12 +0300
Subject: [PATCH] Don't show hover selection of windows and controls when
 select tool is active

---
 ShareX.HelpersLib/Properties/Resources.Designer.cs | 4 ++--
 ShareX.HelpersLib/Properties/Resources.resx        | 4 ++--
 ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs     | 6 ++++--
 ShareX.ScreenCaptureLib/Shapes/Tool/CropTool.cs    | 1 +
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ShareX.HelpersLib/Properties/Resources.Designer.cs b/ShareX.HelpersLib/Properties/Resources.Designer.cs
index 31f00ad95..c8b5718df 100644
--- a/ShareX.HelpersLib/Properties/Resources.Designer.cs
+++ b/ShareX.HelpersLib/Properties/Resources.Designer.cs
@@ -3132,7 +3132,7 @@ internal static string ShapeType_RegionRectangle {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Tool: Crop image (C).
+        ///   Looks up a localized string similar to Crop image (C).
         /// </summary>
         internal static string ShapeType_ToolCrop {
             get {
@@ -3141,7 +3141,7 @@ internal static string ShapeType_ToolCrop {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Select and Move (M).
+        ///   Looks up a localized string similar to Select and move (M).
         /// </summary>
         internal static string ShapeType_ToolSelect {
             get {
diff --git a/ShareX.HelpersLib/Properties/Resources.resx b/ShareX.HelpersLib/Properties/Resources.resx
index e6ec66278..92c7265cd 100644
--- a/ShareX.HelpersLib/Properties/Resources.resx
+++ b/ShareX.HelpersLib/Properties/Resources.resx
@@ -1074,7 +1074,7 @@ Would you like to download and install it?</value>
     <value>1 Week</value>
   </data>
   <data name="ShapeType_ToolSelect" xml:space="preserve">
-    <value>Select and Move (M)</value>
+    <value>Select and move (M)</value>
   </data>
   <data name="ShapeType_DrawingRectangle" xml:space="preserve">
     <value>Drawing: Rectangle (R)</value>
@@ -1146,7 +1146,7 @@ Would you like to download and install it?</value>
     <value>Upload text</value>
   </data>
   <data name="ShapeType_ToolCrop" xml:space="preserve">
-    <value>Tool: Crop image (C)</value>
+    <value>Crop image (C)</value>
   </data>
   <data name="HotkeyType_UploadURL" xml:space="preserve">
     <value>Upload from URL</value>
diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
index 0f7f50e7f..3ab3afb21 100644
--- a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
+++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
@@ -72,7 +72,7 @@ public ShapeType CurrentTool
             {
                 if (currentTool == value) return;
 
-                var previousTool = currentTool;
+                ShapeType previousTool = currentTool;
                 currentTool = value;
 
                 if (Form.IsAnnotationMode)
@@ -1155,6 +1155,7 @@ private BaseShape CheckHover()
                         case ShapeType.DrawingImage:
                         case ShapeType.DrawingSticker:
                         case ShapeType.DrawingCursor:
+                        case ShapeType.ToolSelect:
                             return null;
                     }
 
@@ -1259,6 +1260,7 @@ private void SelectShape(BaseShape shape)
             if (shape != null)
             {
                 shape.ShowNodes();
+
                 if (Options.SwitchToDrawingToolAfterSelection)
                 {
                     CurrentTool = shape.ShapeType;
@@ -1965,4 +1967,4 @@ public void Dispose()
             DeleteAllShapes();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/ShareX.ScreenCaptureLib/Shapes/Tool/CropTool.cs b/ShareX.ScreenCaptureLib/Shapes/Tool/CropTool.cs
index 3f0be4460..3ec692c4d 100644
--- a/ShareX.ScreenCaptureLib/Shapes/Tool/CropTool.cs
+++ b/ShareX.ScreenCaptureLib/Shapes/Tool/CropTool.cs
@@ -114,6 +114,7 @@ private void CancelButton_MousePressed(object sender, MouseEventArgs e)
         public override void Remove()
         {
             base.Remove();
+
             if (Options.SwitchToSelectionToolAfterDrawing)
             {
                 Manager.CurrentTool = ShapeType.ToolSelect;