Support result behaviours & Change keyboard for quick switch window & Add reset check

Author: Jack251970

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -358,36 +358,35 @@ public void ForwardHistory()
         [RelayCommand]
         private void LoadContextMenu()
         {
-            // For quick switch mode, we need to navigate to the path 
-            if (IsQuickSwitch)
+            // For quick switch and right click mode, we need to navigate to the path 
+            if (IsQuickSwitch && Settings.QuickSwitchResultBehaviour == QuickSwitchResultBehaviours.RightClick)
             {
                 if (SelectedResults.SelectedItem != null && DialogWindowHandle != nint.Zero)
                 {
                     var result = SelectedResults.SelectedItem.Result;
                     if (result is QuickSwitchResult quickSwitchResult)
                     {
                         Win32Helper.SetForegroundWindow(DialogWindowHandle);
-                        QuickSwitch.JumpToPath(Win32Helper.GetForegroundWindow(), quickSwitchResult.QuickSwitchPath);
+                        QuickSwitch.JumpToPath(DialogWindowHandle, quickSwitchResult.QuickSwitchPath);
                     }
                 }
+                return;
             }
+
             // For query mode, we load context menu
-            else
+            if (QueryResultsSelected())
             {
-                if (QueryResultsSelected())
-                {
-                    // When switch to ContextMenu from QueryResults, but no item being chosen, should do nothing
-                    // i.e. Shift+Enter/Ctrl+O right after Alt + Space should do nothing
-                    if (SelectedResults.SelectedItem != null)
-                    {
-                        SelectedResults = ContextMenu;
-                    }
-                }
-                else
+                // When switch to ContextMenu from QueryResults, but no item being chosen, should do nothing
+                // i.e. Shift+Enter/Ctrl+O right after Alt + Space should do nothing
+                if (SelectedResults.SelectedItem != null)
                 {
-                    SelectedResults = Results;
+                    SelectedResults = ContextMenu;
                 }
             }
+            else
+            {
+                SelectedResults = Results;
+            }
         }
 
         [RelayCommand]
@@ -452,16 +451,31 @@ private async Task OpenResultAsync(string index)
                 return;
             }
 
-            var hideWindow = await result.ExecuteAsync(new ActionContext
+            // For quick switch and left click mode, we need to navigate to the path
+            if (IsQuickSwitch && Settings.QuickSwitchResultBehaviour == QuickSwitchResultBehaviours.LeftClick)
             {
-                // not null means pressing modifier key + number, should ignore the modifier key
-                SpecialKeyState = index is not null ? SpecialKeyState.Default : GlobalHotkey.CheckModifiers()
-            })
-                .ConfigureAwait(false);
-
-            if (hideWindow)
+                if (SelectedResults.SelectedItem != null && DialogWindowHandle != nint.Zero)
+                {
+                    if (result is QuickSwitchResult quickSwitchResult)
+                    {
+                        Win32Helper.SetForegroundWindow(DialogWindowHandle);
+                        QuickSwitch.JumpToPath(DialogWindowHandle, quickSwitchResult.QuickSwitchPath);
+                    }
+                }
+            }
+            // For query mode, we execute the result
+            else
             {
-                Hide();
+                var hideWindow = await result.ExecuteAsync(new ActionContext
+                {
+                    // not null means pressing modifier key + number, should ignore the modifier key
+                    SpecialKeyState = index is not null ? SpecialKeyState.Default : GlobalHotkey.CheckModifiers()
+                }).ConfigureAwait(false);
+
+                if (hideWindow)
+                {
+                    Hide();
+                }
             }
 
             if (QueryResultsSelected())
@@ -1109,10 +1123,6 @@ private async Task QueryAsync(bool searchDelay, bool isReQuery = false)
             {
                 await QueryResultsAsync(searchDelay, isReQuery);
             }
-            else if (IsQuickSwitch)
-            {
-                return;
-            }
             else if (ContextMenuSelected())
             {
                 QueryContextMenu();
@@ -1581,7 +1591,7 @@ public bool ShouldIgnoreHotkeys()
 
         #region Quick Switch
 
-        public bool IsQuickSwitch { get; private set; }
+        public bool IsQuickSwitch { get; private set; } = false;
         public nint DialogWindowHandle { get; private set; } = nint.Zero;
 
         private bool PreviousMainWindowVisibilityStatus { get; set; }
@@ -1632,6 +1642,8 @@ public async void SetupQuickSwitch(nint handle)
 
         public void ResetQuickSwitch()
         {
+            if (DialogWindowHandle == nint.Zero) return;
+
             DialogWindowHandle = nint.Zero;
             IsQuickSwitch = false;
 
@@ -1712,7 +1724,7 @@ public void Show()
             VisibilityChanged?.Invoke(this, new VisibilityChangedEventArgs { IsVisible = true });
 
             // Switch keyboard layout
-            if (StartWithEnglishMode && !IsQuickSwitch)
+            if (StartWithEnglishMode)
             {
                 Win32Helper.SwitchToEnglishKeyboardLayout(true);
             }
@@ -1779,7 +1791,7 @@ public async void Hide()
             }, DispatcherPriority.Render);
 
             // Switch keyboard layout
-            if (StartWithEnglishMode && !IsQuickSwitch)
+            if (StartWithEnglishMode)
             {
                 Win32Helper.RestorePreviousKeyboardLayout();
             }