diff --git a/ShareX/Forms/AutoCaptureForm.Designer.cs b/ShareX/Forms/AutoCaptureForm.Designer.cs index 1d7ed94ee..c1644d457 100644 --- a/ShareX/Forms/AutoCaptureForm.Designer.cs +++ b/ShareX/Forms/AutoCaptureForm.Designer.cs @@ -77,6 +77,7 @@ private void InitializeComponent() // // tsslStatus // + this.tsslStatus.BackColor = System.Drawing.Color.Transparent; this.tsslStatus.Name = "tsslStatus"; resources.ApplyResources(this.tsslStatus, "tsslStatus"); // diff --git a/ShareX/Forms/AutoCaptureForm.cs b/ShareX/Forms/AutoCaptureForm.cs index 51e72f5a0..eab12c8ff 100644 --- a/ShareX/Forms/AutoCaptureForm.cs +++ b/ShareX/Forms/AutoCaptureForm.cs @@ -108,35 +108,25 @@ private void TakeScreenshot() if (!rect.IsEmpty) { - TaskSettings taskSettings; - if(this.TaskSettings != null) - { - taskSettings = this.TaskSettings; - } - else - { - taskSettings = TaskSettings.GetDefaultTaskSettings(); - } - - Image img = TaskHelpers.GetScreenshot(taskSettings).CaptureRectangle(rect); + Image img = TaskHelpers.GetScreenshot(TaskSettings).CaptureRectangle(rect); if (img != null) { - taskSettings.UseDefaultAfterCaptureJob = false; - taskSettings.AfterCaptureJob = taskSettings.AfterCaptureJob.Remove(AfterCaptureTasks.AnnotateImage); - taskSettings.UseDefaultAdvancedSettings = false; - taskSettings.AdvancedSettings.DisableNotifications = true; + TaskSettings.UseDefaultAfterCaptureJob = false; + TaskSettings.AfterCaptureJob = TaskSettings.AfterCaptureJob.Remove(AfterCaptureTasks.AnnotateImage); + TaskSettings.UseDefaultAdvancedSettings = false; + TaskSettings.AdvancedSettings.DisableNotifications = true; - UploadManager.RunImageTask(img, taskSettings, true, true); + UploadManager.RunImageTask(img, TaskSettings, true, true); } } } - private void SelectRegion(TaskSettings taskSettings) + private void SelectRegion() { Rectangle rect; - if (RegionCaptureTasks.GetRectangleRegion(out rect, taskSettings.CaptureSettings.SurfaceOptions)) + if (RegionCaptureTasks.GetRectangleRegion(out rect, TaskSettings.CaptureSettings.SurfaceOptions)) { Program.Settings.AutoCaptureRegion = rect; UpdateRegion(); @@ -217,8 +207,7 @@ private void rbCustomRegion_CheckedChanged(object sender, EventArgs e) private void btnRegion_Click(object sender, EventArgs e) { - TaskSettings taskSettings = TaskSettings.GetDefaultTaskSettings(); - SelectRegion(taskSettings); + SelectRegion(); } private void nudDuration_ValueChanged(object sender, EventArgs e) diff --git a/ShareX/Forms/AutoCaptureForm.resx b/ShareX/Forms/AutoCaptureForm.resx index 3df4f445e..9a2ead24d 100644 --- a/ShareX/Forms/AutoCaptureForm.resx +++ b/ShareX/Forms/AutoCaptureForm.resx @@ -121,6 +121,12 @@ 17, 17 + + 75, 16 + + + 0, 17 + 0, 241 @@ -146,12 +152,6 @@ 7 - - 75, 16 - - - 0, 17 - False @@ -369,54 +369,6 @@ 1 - - rbFullscreen - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbRegion - - - 0 - - - rbCustomRegion - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbRegion - - - 1 - - - 8, 8 - - - 304, 96 - - - 0 - - - Region - - - gbRegion - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - True @@ -471,6 +423,30 @@ 1 + + 8, 8 + + + 304, 96 + + + 0 + + + Region + + + gbRegion + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + True