From e6391117787450ba66c1948fb96a214fdd0763e9 Mon Sep 17 00:00:00 2001 From: Jaex Date: Sat, 14 May 2016 12:19:31 +0300 Subject: [PATCH] Added AnnotationEnabled setting so people can disable it to get old behavior --- ShareX.ScreenCaptureLib/SurfaceOptions.cs | 3 +++ ShareX/Forms/MainForm.cs | 3 ++- ShareX/TaskHelpers.cs | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ShareX.ScreenCaptureLib/SurfaceOptions.cs b/ShareX.ScreenCaptureLib/SurfaceOptions.cs index f3f76163e..306384fd9 100644 --- a/ShareX.ScreenCaptureLib/SurfaceOptions.cs +++ b/ShareX.ScreenCaptureLib/SurfaceOptions.cs @@ -37,6 +37,9 @@ public class SurfaceOptions [DefaultValue(true), Description("Allow screenshot capture as soon as the mouse is released. This disables the ability to capture multiple shapes and to move and/or resize them.")] public bool QuickCrop { get; set; } + [DefaultValue(true), Description("If annotation is disabled then right click will cancel screen capture instead of opening options menu.")] + public bool AnnotationEnabled { get; set; } + [DefaultValue(true), Description("Allows selection of window regions in region capture.")] public bool DetectWindows { get; set; } diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 285e8c4a5..43e805710 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -2097,7 +2097,8 @@ private void CaptureRegion(CaptureType captureType, TaskSettings taskSettings, b { default: case CaptureType.Rectangle: - surface = new RectangleRegionForm(RectangleRegionMode.Annotation); + RectangleRegionMode mode = taskSettings.CaptureSettings.SurfaceOptions.AnnotationEnabled ? RectangleRegionMode.Annotation : RectangleRegionMode.Default; + surface = new RectangleRegionForm(mode); break; case CaptureType.Polygon: surface = new PolygonRegionForm(); diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs index cadfe717d..daefcb1a6 100644 --- a/ShareX/TaskHelpers.cs +++ b/ShareX/TaskHelpers.cs @@ -561,7 +561,6 @@ public static void OpenRuler() form.Config.QuickCrop = false; form.Config.ShowInfo = true; form.Config.ShowTips = false; - form.ShapeManager.MinimumSize = 3; form.Prepare(); form.ShowDialog(); }