Skip to content

Commit b96a02b

Browse files
committed
add last query mode update to SetCustomPluginHotkey
1 parent 04d959c commit b96a02b

File tree

1 file changed

+25
-17
lines changed

1 file changed

+25
-17
lines changed

Flow.Launcher/Helper/HotKeyMapper.cs

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,7 @@ internal static void OnHotkey(object sender, HotkeyEventArgs e)
5757
{
5858
if (!ShouldIgnoreHotkeys())
5959
{
60-
if (settings.LastQueryMode == LastQueryMode.Empty)
61-
{
62-
mainViewModel.ChangeQueryText(string.Empty);
63-
}
64-
else if (settings.LastQueryMode == LastQueryMode.Preserved)
65-
{
66-
mainViewModel.LastQuerySelected = true;
67-
}
68-
else if (settings.LastQueryMode == LastQueryMode.Selected)
69-
{
70-
mainViewModel.LastQuerySelected = false;
71-
}
72-
else
73-
{
74-
throw new ArgumentException($"wrong LastQueryMode: <{settings.LastQueryMode}>");
75-
}
60+
UpdateLastQUeryMode();
7661

7762
mainViewModel.ToggleFlowLauncher();
7863
e.Handled = true;
@@ -87,14 +72,37 @@ private static bool ShouldIgnoreHotkeys()
8772
return settings.IgnoreHotkeysOnFullscreen && WindowsInteropHelper.IsWindowFullscreen();
8873
}
8974

75+
private static void UpdateLastQUeryMode()
76+
{
77+
switch(settings.LastQueryMode)
78+
{
79+
case LastQueryMode.Empty:
80+
mainViewModel.ChangeQueryText(string.Empty);
81+
break;
82+
case LastQueryMode.Preserved:
83+
mainViewModel.LastQuerySelected = true;
84+
break;
85+
case LastQueryMode.Selected:
86+
mainViewModel.LastQuerySelected = false;
87+
break;
88+
default:
89+
throw new ArgumentException($"wrong LastQueryMode: <{settings.LastQueryMode}>");
90+
91+
}
92+
}
93+
9094
private static void SetCustomPluginHotkey()
9195
{
9296
if (settings.CustomPluginHotkeys == null) return;
9397
foreach (CustomPluginHotkey hotkey in settings.CustomPluginHotkeys)
9498
{
9599
SetHotkey(hotkey.Hotkey, (s, e) =>
96100
{
97-
if (ShouldIgnoreHotkeys()) return;
101+
if (ShouldIgnoreHotkeys())
102+
return;
103+
104+
UpdateLastQUeryMode();
105+
98106
mainViewModel.MainWindowVisibility = Visibility.Visible;
99107
mainViewModel.ChangeQueryText(hotkey.ActionKeyword);
100108
});

0 commit comments

Comments
 (0)