mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-06 13:16:29 +13:00
fixed #1397: Close ShareX from tray menu when mouse released
This commit is contained in:
parent
c709ba3349
commit
bcdf0573d8
2 changed files with 8 additions and 10 deletions
|
@ -697,12 +697,6 @@ private void CheckUpdate()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ForceClose()
|
|
||||||
{
|
|
||||||
forceClose = true;
|
|
||||||
Close();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void UseCommandLineArgs(List<CLICommand> commands)
|
public void UseCommandLineArgs(List<CLICommand> commands)
|
||||||
{
|
{
|
||||||
TaskSettings taskSettings = FindCLITask(commands);
|
TaskSettings taskSettings = FindCLITask(commands);
|
||||||
|
@ -1323,12 +1317,16 @@ private void tsmiTrayShow_Click(object sender, EventArgs e)
|
||||||
|
|
||||||
private void tsmiTrayExit_MouseDown(object sender, MouseEventArgs e)
|
private void tsmiTrayExit_MouseDown(object sender, MouseEventArgs e)
|
||||||
{
|
{
|
||||||
ForceClose();
|
forceClose = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void cmsTray_Closed(object sender, ToolStripDropDownClosedEventArgs e)
|
private void cmsTray_Closed(object sender, ToolStripDropDownClosedEventArgs e)
|
||||||
{
|
{
|
||||||
if (!forceClose)
|
if (forceClose)
|
||||||
|
{
|
||||||
|
Close();
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
Program.SaveAllSettingsAsync();
|
Program.SaveAllSettingsAsync();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1555,7 +1555,7 @@
|
||||||
<value>Exit</value>
|
<value>Exit</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cmsTray.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="cmsTray.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>189, 462</value>
|
<value>189, 484</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>cmsTray.Name" xml:space="preserve">
|
<data name=">>cmsTray.Name" xml:space="preserve">
|
||||||
<value>cmsTray</value>
|
<value>cmsTray</value>
|
||||||
|
@ -2773,6 +2773,6 @@
|
||||||
<value>MainForm</value>
|
<value>MainForm</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>$this.Type" xml:space="preserve">
|
<data name=">>$this.Type" xml:space="preserve">
|
||||||
<value>ShareX.HotkeyForm, ShareX, Version=10.7.1.0, Culture=neutral, PublicKeyToken=null</value>
|
<value>ShareX.HotkeyForm, ShareX, Version=10.8.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||||
</data>
|
</data>
|
||||||
</root>
|
</root>
|
Loading…
Reference in a new issue