Fix ChangeQuery & ReQuery Work Issue When Results Are Not From Query Results

Flow.Launcher/CustomQueryHotkeySetting.xaml.cs

@@ -76,6 +76,8 @@ public void UpdateItem(CustomPluginHotkey item)
 
         private void BtnTestActionKeyword_OnClick(object sender, RoutedEventArgs e)
         {
+            // if user happens to open context menu, we need to return back to query results before changing query
+            App.API.BackToQueryResults();
             App.API.ChangeQuery(tbAction.Text);
             Application.Current.MainWindow.Show();
             Application.Current.MainWindow.Opacity = 1;

Flow.Launcher/CustomShortcutSetting.xaml.cs

@@ -64,6 +64,8 @@ private void cmdEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
 
         private void BtnTestShortcut_OnClick(object sender, RoutedEventArgs e)
         {
+            // if user happens to open context menu, we need to return back to query results before changing query
+            App.API.BackToQueryResults();
             App.API.ChangeQuery(tbExpand.Text);
             Application.Current.MainWindow.Show();
             Application.Current.MainWindow.Opacity = 1;

Flow.Launcher/ResultListBox.xaml.cs

@@ -149,7 +149,11 @@ private void ResultList_MouseMove(object sender, MouseEventArgs e)
             var rawQuery = query;
             var effect = DragDrop.DoDragDrop((DependencyObject)sender, data, DragDropEffects.Move | DragDropEffects.Copy);
             if (effect == DragDropEffects.Move)
+            {
+                // if user happens to open context menu, we need to return back to query results before changing query
+                App.API.BackToQueryResults();
                 App.API.ChangeQuery(rawQuery, true);
+            }
         }
         private void ResultListBox_OnPreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -1266,6 +1266,7 @@ private Result ContextMenuTopMost(Result result)
                     {
                         _topMostRecord.Remove(result);
                         App.API.ShowMsg(InternationalizationManager.Instance.GetTranslation("success"));
+                        // if user happens to open context menu, we need to return back to query results before changing query
                         App.API.BackToQueryResults();
                         App.API.ReQuery();
                         return false;
@@ -1284,6 +1285,7 @@ private Result ContextMenuTopMost(Result result)
                     {
                         _topMostRecord.AddOrUpdate(result);
                         App.API.ShowMsg(InternationalizationManager.Instance.GetTranslation("success"));
+                        // if user happens to open context menu, we need to return back to query results before changing query
                         App.API.BackToQueryResults();
                         App.API.ReQuery();
                         return false;

Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs

@@ -64,6 +64,8 @@ public string Category
         private void ShowCommandQuery(string action)
         {
             var actionKeyword = PluginManagerData.Metadata.ActionKeywords.Any() ? PluginManagerData.Metadata.ActionKeywords[0] + " " : String.Empty;
+            // if user happens to open context menu, we need to return back to query results before changing query
+            App.API.BackToQueryResults();
             App.API.ChangeQuery($"{actionKeyword}{action} {_plugin.Name}");
             App.API.ShowMainWindow();
         }

Flow.Launcher/ViewModel/PluginViewModel.cs

@@ -146,6 +146,8 @@ private void OpenSourceCodeLink()
         [RelayCommand]
         private void OpenDeletePluginWindow()
         {
+            // if user happens to open context menu, we need to return back to query results before changing query
+            PluginManager.API.BackToQueryResults();
             PluginManager.API.ChangeQuery($"{PluginManagerActionKeyword} uninstall {PluginPair.Metadata.Name}".Trim(), true);
             PluginManager.API.ShowMainWindow();
         }

Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs

@@ -59,7 +59,6 @@ public List<Result> LoadContextMenus(Result selectedResult)
                         var link = pluginManifestInfo.UrlSourceCode.StartsWith("https://github.com") 
                                         ? Regex.Replace(pluginManifestInfo.UrlSourceCode, @"\/tree\/\w+$", "") + "/issues"
                                         : pluginManifestInfo.UrlSourceCode;
-
                         Context.API.OpenUrl(link);
                         return true;
                     }

Plugins/Flow.Launcher.Plugin.Shell/Main.cs

@@ -5,7 +5,6 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Windows;
 using WindowsInput;
 using WindowsInput.Native;
 using Flow.Launcher.Infrastructure.Hotkey;
@@ -379,9 +378,11 @@ bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state)
         private void OnWinRPressed()
         {
             // show the main window and set focus to the query box
-            Task.Run(() =>
+            _ = Task.Run(() =>
             {
                 context.API.ShowMainWindow();
+                // if user happens to open context menu, we need to return back to query results before changing query
+                context.API.BackToQueryResults();
                 context.API.ChangeQuery($"{context.CurrentPluginMetadata.ActionKeywords[0]}{Plugin.Query.TermSeparator}");
             });