From b1ef7058246640510ddfcfae73825bc58196a2b2 Mon Sep 17 00:00:00 2001 From: David Ruhmann Date: Thu, 20 Aug 2015 11:29:10 -0500 Subject: [PATCH] change to insert and delete --- .../Forms/RectangleRegion.cs | 3 +- .../Properties/Resources.Designer.cs | 29 +++++++----------- .../Properties/Resources.resx | 9 ++---- .../RegionHelpers/AreaManager.cs | 30 +++++++++++-------- 4 files changed, 31 insertions(+), 40 deletions(-) diff --git a/ShareX.ScreenCaptureLib/Forms/RectangleRegion.cs b/ShareX.ScreenCaptureLib/Forms/RectangleRegion.cs index 42ef2969c..13612d7ba 100644 --- a/ShareX.ScreenCaptureLib/Forms/RectangleRegion.cs +++ b/ShareX.ScreenCaptureLib/Forms/RectangleRegion.cs @@ -348,7 +348,7 @@ protected virtual void WriteTips(StringBuilder sb) if (AreaManager.IsCreating) { - sb.AppendLine(Resources.RectangleRegion_WriteTips__End__Stop_region_selection); + sb.AppendLine(Resources.RectangleRegion_WriteTips__Insert__Stop_region_selection); sb.AppendLine(Resources.RectangleRegion_WriteTips__Right_click__Cancel_region_selection); sb.AppendLine(Resources.RectangleRegion_WriteTips__Esc__Cancel_capture); } @@ -367,7 +367,6 @@ protected virtual void WriteTips(StringBuilder sb) if (!Config.QuickCrop && !AreaManager.IsCreating && AreaManager.IsCurrentAreaValid) { - sb.AppendLine(Resources.RectangleRegion_WriteTips__End__Stop_region_editing); sb.AppendLine(string.Format(Resources.RectangleRegion_WriteTips__Arrow_keys__Resize_selected_region_from__0_, AreaManager.ResizeManager.IsBottomRightResizing ? Resources.RectangleRegion_WriteTips_bottom_right : Resources.RectangleRegion_WriteTips_top_left)); sb.AppendLine(string.Format(Resources.RectangleRegion_WriteTips__Tab__Swap_resize_anchor_to__0_, AreaManager.ResizeManager.IsBottomRightResizing ? diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs index 6277f2425..c17ead03a 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs +++ b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs @@ -291,24 +291,6 @@ internal class Resources { } } - /// - /// Looks up a localized string similar to [End] Stop editing the region. - /// - internal static string RectangleRegion_WriteTips__End__Stop_region_editing { - get { - return ResourceManager.GetString("RectangleRegion_WriteTips__End__Stop_region_editing", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to [End] Stop region selection. - /// - internal static string RectangleRegion_WriteTips__End__Stop_region_selection { - get { - return ResourceManager.GetString("RectangleRegion_WriteTips__End__Stop_region_selection", resourceCulture); - } - } - /// /// Looks up a localized string similar to [Esc] Cancel capture. /// @@ -381,6 +363,15 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to [Insert] Stop region selection. + /// + internal static string RectangleRegion_WriteTips__Insert__Stop_region_selection { + get { + return ResourceManager.GetString("RectangleRegion_WriteTips__Insert__Stop_region_selection", resourceCulture); + } + } + /// /// Looks up a localized string similar to [M] {0} magnifier. /// @@ -490,7 +481,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to [Right click] [Insert] Cancel region selection. + /// Looks up a localized string similar to [Right click] [Delete] Cancel region selection. /// internal static string RectangleRegion_WriteTips__Right_click__Cancel_region_selection { get { diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.resx b/ShareX.ScreenCaptureLib/Properties/Resources.resx index ff14c084f..0c65a441b 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.resx +++ b/ShareX.ScreenCaptureLib/Properties/Resources.resx @@ -177,7 +177,7 @@ X: {4} Y: {5} [F1] Hide tips - [Right click] [Insert] Cancel region selection + [Right click] [Delete] Cancel region selection [Esc] Cancel capture @@ -290,10 +290,7 @@ X: {4} Y: {5} [Numpad + or -] Change triangle angle - - [End] Stop editing the region - - - [End] Stop region selection + + [Insert] Stop region selection \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/RegionHelpers/AreaManager.cs b/ShareX.ScreenCaptureLib/RegionHelpers/AreaManager.cs index f73fe12fe..157b4b418 100644 --- a/ShareX.ScreenCaptureLib/RegionHelpers/AreaManager.cs +++ b/ShareX.ScreenCaptureLib/RegionHelpers/AreaManager.cs @@ -149,22 +149,19 @@ private void surface_KeyDown(object sender, KeyEventArgs e) case Keys.Insert: if (IsCreating) { - CancelRegionSelection(); EndRegionSelection(); } else { - RegionSelection(InputManager.MousePosition); - } - break; - case Keys.End: - if (IsCreating) - { - EndRegionSelection(); - } - else - { - DeselectArea(); + int areaIndex = SelectedAreaIndex; + if (ResizeManager.Visible) + { + DeselectArea(); + } + if (0 > areaIndex || areaIndex != AreaIntersect()) + { + RegionSelection(InputManager.MousePosition); + } } break; case Keys.ShiftKey: @@ -241,6 +238,10 @@ private void surface_KeyUp(object sender, KeyEventArgs e) break; case Keys.Delete: RemoveCurrentArea(); + if (IsCreating) + { + EndRegionSelection(); + } break; } } @@ -357,7 +358,10 @@ private void surface_MouseDown(object sender, MouseEventArgs e) { if (e.Button == MouseButtons.Left) { - RegionSelection(e.Location); + if (!IsCreating) + { + RegionSelection(e.Location); + } } }