CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-03 02:36:50 +13:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3276 from VodBox/auto-override

Browse source 
Respect Hotkey Overrides with Auto Capture
This commit is contained in:
Jaex 2018-04-02 14:48:55 +03:00 committed by GitHub
commit 0e021a1d86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ShareX/Forms/AutoCaptureForm.cs
View file

@ -51,6 +51,7 @@ public static AutoCaptureForm Instance
}
public static bool IsRunning { get; private set; }
public TaskSettings TaskSettings { get; internal set; }
private bool isLoaded;
private Timer statusTimer;
@ -107,7 +108,15 @@ private void TakeScreenshot()
if (!rect.IsEmpty)
{
TaskSettings taskSettings = TaskSettings.GetDefaultTaskSettings();
TaskSettings taskSettings;
if(this.TaskSettings != null)
{
taskSettings = this.TaskSettings;
}
else
{
taskSettings = TaskSettings.GetDefaultTaskSettings();
}
Image img = TaskHelpers.GetScreenshot(taskSettings).CaptureRectangle(rect);

14
ShareX/TaskHelpers.cs
View file

@ -135,10 +135,10 @@ public static void ExecuteJob(TaskSettings taskSettings, HotkeyType job, CLIComm
OCRImage(safeTaskSettings);
break;
case HotkeyType.AutoCapture:
OpenAutoCapture();
OpenAutoCapture(safeTaskSettings);
break;
case HotkeyType.StartAutoCapture:
StartAutoCapture();
StartAutoCapture(safeTaskSettings);
break;
// Screen record
case HotkeyType.ScreenRecorder:
@ -653,8 +653,11 @@ public static void OpenScrollingCapture(TaskSettings taskSettings = null, bool f
scrollingCaptureForm.Show();
}
public static void OpenAutoCapture()
public static void OpenAutoCapture(TaskSettings taskSettings = null)
{
if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
AutoCaptureForm.Instance.TaskSettings = taskSettings;
AutoCaptureForm.Instance.ForceActivate();
}
@ -674,11 +677,14 @@ public static void OpenWebpageCapture(TaskSettings taskSettings = null)
webpageCaptureForm.Show();
}
public static void StartAutoCapture()
public static void StartAutoCapture(TaskSettings taskSettings = null)
{
if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
if (!AutoCaptureForm.IsRunning)
{
AutoCaptureForm form = AutoCaptureForm.Instance;
form.TaskSettings = taskSettings;
form.Show();
form.Execute();
}