From 248f4221e283c46ca6f067c553ce36e08e6779c7 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Sat, 13 Sep 2014 10:10:46 +0300
Subject: [PATCH] ScreenRecorderUseActiveWindow setting not necessary anymore
 because region selection allows selecting client rectangle

---
 ShareX/Forms/ScreenRecordForm.cs | 38 ++------------------------------
 ShareX/TaskSettings.cs           |  3 ---
 2 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/ShareX/Forms/ScreenRecordForm.cs b/ShareX/Forms/ScreenRecordForm.cs
index e79a9320d..df092fc70 100644
--- a/ShareX/Forms/ScreenRecordForm.cs
+++ b/ShareX/Forms/ScreenRecordForm.cs
@@ -55,7 +55,6 @@ public static ScreenRecordForm Instance
         }
 
         private ScreenRecorder screenRecorder;
-        private Rectangle captureRectangle;
         private ScreenRegionForm regionForm;
         private DWMManager dwmManager;
 
@@ -73,32 +72,6 @@ private void TrayIcon_MouseClick(object sender, MouseEventArgs e)
             }
         }
 
-        private void SelectRegion()
-        {
-            TaskHelpers.SelectRegion(out captureRectangle);
-        }
-
-        private void ActiveWindowRegion(TaskSettings taskSettings)
-        {
-            IntPtr handle = NativeMethods.GetForegroundWindow();
-
-            if (handle.ToInt32() > 0)
-            {
-                if (taskSettings.CaptureSettings.CaptureClientArea)
-                {
-                    captureRectangle = NativeMethods.GetClientRect(handle);
-                }
-                else
-                {
-                    captureRectangle = CaptureHelpers.GetWindowRectangle(handle);
-                }
-            }
-            else
-            {
-                SelectRegion();
-            }
-        }
-
         public void StartRecording(TaskSettings taskSettings)
         {
             if (taskSettings.CaptureSettings.RunScreencastCLI)
@@ -144,15 +117,8 @@ public void StartRecording(TaskSettings taskSettings)
                 }
             }
 
-            if (taskSettings.AdvancedSettings.ScreenRecorderUseActiveWindow)
-            {
-                ActiveWindowRegion(taskSettings);
-            }
-            else
-            {
-                SelectRegion();
-            }
-
+            Rectangle captureRectangle;
+            TaskHelpers.SelectRegion(out captureRectangle);
             captureRectangle = CaptureHelpers.EvenRectangleSize(captureRectangle);
 
             if (IsRecording || !captureRectangle.IsValid() || screenRecorder != null)
diff --git a/ShareX/TaskSettings.cs b/ShareX/TaskSettings.cs
index 16c0fda29..23f8d0ef7 100644
--- a/ShareX/TaskSettings.cs
+++ b/ShareX/TaskSettings.cs
@@ -440,9 +440,6 @@ public Size ToastWindowSize
         [Category("Name pattern"), DefaultValue(50), Description("Maximum name pattern title (%t) length for file name.")]
         public int NamePatternMaxTitleLength { get; set; }
 
-        [Category("Screen recorder"), DefaultValue(false), Description("Use active window region instead of showing region selection window for screen recorder.")]
-        public bool ScreenRecorderUseActiveWindow { get; set; }
-
         public TaskSettingsAdvanced()
         {
             this.ApplyDefaultPropertyValues();