From ddbbd693e8992c8c8f18d21f71f3dff2a01e02d2 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 12 Feb 2025 15:06:15 +0800
Subject: [PATCH] Make sure back to query results from context menu before
 changing query

---
 Flow.Launcher/CustomQueryHotkeySetting.xaml.cs      | 1 +
 Flow.Launcher/CustomShortcutSetting.xaml.cs         | 1 +
 Flow.Launcher/ResultListBox.xaml.cs                 | 3 +++
 Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs | 1 +
 Flow.Launcher/ViewModel/PluginViewModel.cs          | 1 +
 5 files changed, 7 insertions(+)

diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
index 81e7600b8..3db49b381 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
@@ -76,6 +76,7 @@ namespace Flow.Launcher
 
         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;
diff --git a/Flow.Launcher/CustomShortcutSetting.xaml.cs b/Flow.Launcher/CustomShortcutSetting.xaml.cs
index dec3506eb..10452726d 100644
--- a/Flow.Launcher/CustomShortcutSetting.xaml.cs
+++ b/Flow.Launcher/CustomShortcutSetting.xaml.cs
@@ -64,6 +64,7 @@ namespace Flow.Launcher
 
         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;
diff --git a/Flow.Launcher/ResultListBox.xaml.cs b/Flow.Launcher/ResultListBox.xaml.cs
index ac51b195c..cc003457f 100644
--- a/Flow.Launcher/ResultListBox.xaml.cs
+++ b/Flow.Launcher/ResultListBox.xaml.cs
@@ -149,7 +149,10 @@ namespace Flow.Launcher
             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)
         {
diff --git a/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs b/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs
index 38b5bec65..97c938e78 100644
--- a/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs
+++ b/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs
@@ -64,6 +64,7 @@ namespace Flow.Launcher.ViewModel
         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();
         }
diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModel/PluginViewModel.cs
index 4ce8bd470..e56e8e9e5 100644
--- a/Flow.Launcher/ViewModel/PluginViewModel.cs
+++ b/Flow.Launcher/ViewModel/PluginViewModel.cs
@@ -146,6 +146,7 @@ namespace Flow.Launcher.ViewModel
         [RelayCommand]
         private void OpenDeletePluginWindow()
         {
+            PluginManager.API.BackToQueryResults();
             PluginManager.API.ChangeQuery($"{PluginManagerActionKeyword} uninstall {PluginPair.Metadata.Name}".Trim(), true);
             PluginManager.API.ShowMainWindow();
         }