CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-29 17:02:05 +13:00
Code Issues Projects Releases Packages Wiki Activity

Only continue countdown if window is active

Browse source
This commit is contained in:
Jaex 2021-06-17 20:10:38 +03:00
parent 138e7f25b3
commit 24e581403c
5 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ShareX.HelpersLib/Native/NativeMethods_Helpers.cs
View file

@ -364,6 +364,11 @@ public static bool IsWindowCloaked(IntPtr handle)
return false; return false;
} }
public static bool IsActive(IntPtr handle)
{
return GetForegroundWindow() == handle;
}
public static void RestoreWindow(IntPtr handle) public static void RestoreWindow(IntPtr handle)
{ {
WINDOWPLACEMENT wp = new WINDOWPLACEMENT(); WINDOWPLACEMENT wp = new WINDOWPLACEMENT();

2
ShareX.HelpersLib/Native/WindowInfo.cs
View file

@ -92,7 +92,7 @@ public int ProcessId
public bool IsCloaked => NativeMethods.IsWindowCloaked(Handle); public bool IsCloaked => NativeMethods.IsWindowCloaked(Handle);
public bool IsActive => NativeMethods.GetForegroundWindow() == Handle; public bool IsActive => NativeMethods.IsActive(Handle);
public WindowInfo(IntPtr handle) public WindowInfo(IntPtr handle)
{ {

2
ShareX/Forms/FirstTimeUploadForm.Designer.cs generated
View file

@ -44,6 +44,7 @@ private void InitializeComponent()
// //
// btnYes // btnYes
// //
this.btnYes.DialogResult = System.Windows.Forms.DialogResult.Yes;
resources.ApplyResources(this.btnYes, "btnYes"); resources.ApplyResources(this.btnYes, "btnYes");
this.btnYes.Name = "btnYes"; this.btnYes.Name = "btnYes";
this.btnYes.UseVisualStyleBackColor = true; this.btnYes.UseVisualStyleBackColor = true;
@ -51,6 +52,7 @@ private void InitializeComponent()
// //
// btnNo // btnNo
// //
this.btnNo.DialogResult = System.Windows.Forms.DialogResult.No;
resources.ApplyResources(this.btnNo, "btnNo"); resources.ApplyResources(this.btnNo, "btnNo");
this.btnNo.Name = "btnNo"; this.btnNo.Name = "btnNo";
this.btnNo.UseVisualStyleBackColor = true; this.btnNo.UseVisualStyleBackColor = true;

26
ShareX/Forms/FirstTimeUploadForm.cs
View file

@ -49,19 +49,16 @@ public FirstTimeUploadForm()
private void UpdateCountdown() private void UpdateCountdown()
{ {
if (!IsDisposed) if (countdown < 1)
{ {
if (countdown < 1) btnYes.Text = textYes;
{ btnYes.Enabled = true;
btnYes.Text = textYes; tCountdown.Stop();
btnYes.Enabled = true; }
tCountdown.Stop(); else
} {
else btnYes.Text = textYes + " (" + countdown + ")";
{ countdown--;
btnYes.Text = textYes + " (" + countdown + ")";
countdown--;
}
} }
} }
@ -72,7 +69,10 @@ private void FirstTimeUploadForm_Shown(object sender, System.EventArgs e)
private void tCountdown_Tick(object sender, System.EventArgs e) private void tCountdown_Tick(object sender, System.EventArgs e)
{ {
UpdateCountdown(); if (!IsDisposed && NativeMethods.IsActive(Handle))
{
UpdateCountdown();
}
} }
private void btnYes_Click(object sender, System.EventArgs e) private void btnYes_Click(object sender, System.EventArgs e)

4
ShareX/Forms/FirstTimeUploadForm.resx
View file

@ -132,7 +132,7 @@
<value>1</value> <value>1</value>
</data> </data>
<data name="lblInfo.Text" xml:space="preserve"> <data name="lblInfo.Text" xml:space="preserve">
<value>Are you sure you want to upload screenshots? <value>Do you want ShareX to upload screenshots?
Press "No" to cancel the current upload and disable screenshot auto uploading.</value> Press "No" to cancel the current upload and disable screenshot auto uploading.</value>
</data> </data>
@ -218,7 +218,7 @@ Press "No" to cancel the current upload and disable screenshot auto uploading.</
<value>0</value> <value>0</value>
</data> </data>
<data name="lblHeader.Text" xml:space="preserve"> <data name="lblHeader.Text" xml:space="preserve">
<value>Important!</value> <value>Attention!</value>
</data> </data>
<data name="lblHeader.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing"> <data name="lblHeader.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleCenter</value> <value>MiddleCenter</value>