fix: respect tray icon behavior

This commit is contained in:
nopeless
2023-10-02 14:09:52 -05:00
parent 4509b67ed9
commit a30920ed70
2 changed files with 4 additions and 4 deletions

View File

@@ -337,7 +337,7 @@ namespace GHelper.Input
if (e.Modifier == (ModifierKeys.Control | ModifierKeys.Shift)) if (e.Modifier == (ModifierKeys.Control | ModifierKeys.Shift))
{ {
if (e.Key == keyProfile) modeControl.CyclePerformanceMode(); if (e.Key == keyProfile) modeControl.CyclePerformanceMode();
if (e.Key == keyApp) Program.SettingsToggle(); if (e.Key == keyApp) Program.SettingsToggle("", true);
if (e.Key == Keys.F20) KeyProcess("m3"); if (e.Key == Keys.F20) KeyProcess("m3");
} }
@@ -427,7 +427,7 @@ namespace GHelper.Input
{ {
Program.settingsForm.BeginInvoke(delegate Program.settingsForm.BeginInvoke(delegate
{ {
Program.SettingsToggle(); Program.SettingsToggle("", true);
}); });
} }
catch (Exception ex) catch (Exception ex)

View File

@@ -213,13 +213,13 @@ namespace GHelper
SetAutoModes(true); SetAutoModes(true);
} }
public static void SettingsToggle(string action = "") public static void SettingsToggle(string action = "", bool checkForFocus = false)
{ {
if (settingsForm.Visible) if (settingsForm.Visible)
{ {
// If helper window is not on top, this just focuses on the app again // If helper window is not on top, this just focuses on the app again
// Pressing the ghelper button again will hide the app // Pressing the ghelper button again will hide the app
if (!settingsForm.HasAnyFocus()) if (checkForFocus && !settingsForm.HasAnyFocus())
{ {
settingsForm.ShowAll(); settingsForm.ShowAll();
} }