Make sure back to query results from context menu before changing query

Author: Jack251970

Flow.Launcher/CustomQueryHotkeySetting.xaml.cs

@@ -76,6 +76,7 @@ public void UpdateItem(CustomPluginHotkey item)
 
         private void BtnTestActionKeyword_OnClick(object sender, RoutedEventArgs e)
         {
+            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,7 @@ private void cmdEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
 
         private void BtnTestShortcut_OnClick(object sender, RoutedEventArgs e)
         {
+            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,10 @@ 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)
+            {
+                App.API.BackToQueryResults();
                 App.API.ChangeQuery(rawQuery, true);
+            }
         }
         private void ResultListBox_OnPreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {

Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs

@@ -64,6 +64,7 @@ public string Category
         private void ShowCommandQuery(string action)
         {
             var actionKeyword = PluginManagerData.Metadata.ActionKeywords.Any() ? PluginManagerData.Metadata.ActionKeywords[0] + " " : String.Empty;
+            App.API.BackToQueryResults();
             App.API.ChangeQuery($"{actionKeyword}{action} {_plugin.Name}");
             App.API.ShowMainWindow();
         }

Flow.Launcher/ViewModel/PluginViewModel.cs

@@ -146,6 +146,7 @@ private void OpenSourceCodeLink()
         [RelayCommand]
         private void OpenDeletePluginWindow()
         {
+            PluginManager.API.BackToQueryResults();
             PluginManager.API.ChangeQuery($"{PluginManagerActionKeyword} uninstall {PluginPair.Metadata.Name}".Trim(), true);
             PluginManager.API.ShowMainWindow();
         }