Remove back to query result and call this function in ChangeQuery & ReQuery

Jack251970 · Jack251970 · commit aee585620a62 · 2025-02-22T19:32:08.000+08:00
diff --git a/Flow.Launcher.Core/Plugin/JsonRPCV2Models/JsonRPCPublicAPI.cs b/Flow.Launcher.Core/Plugin/JsonRPCV2Models/JsonRPCPublicAPI.cs
@@ -170,10 +170,5 @@ public void OpenAppUri(string appUri)
         {
             _api.OpenAppUri(appUri);
         }
-
-        public void BackToQueryResults()
-        {
-            _api.BackToQueryResults();
-        }
     }
 }
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -17,7 +17,8 @@ namespace Flow.Launcher.Plugin
     public interface IPublicAPI
     {
         /// <summary>
-        /// Change Flow.Launcher query
+        /// Change Flow.Launcher query.
+        /// When current results is from context menu or history, we will back to query results before changing query.
         /// </summary>
         /// <param name="query">query text</param>
         /// <param name="requery">
@@ -299,17 +300,11 @@ public interface IPublicAPI
 
         /// <summary>
         /// Reloads the query.
-        /// This method should run when selected item is from query results.
+        /// When current results is from context menu or history, we will back to query results before changing query.
         /// </summary>
         /// <param name="reselect">Choose the first result after reload if true; keep the last selected result if false. Default is true.</param>
         public void ReQuery(bool reselect = true);
 
-        /// <summary>
-        /// Back to the query results.
-        /// This method should run when selected item is from context menu or history.
-        /// </summary>
-        public void BackToQueryResults();
-
         /// <summary>
         /// Displays a standardised Flow message box.
         /// </summary>
diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
@@ -76,8 +76,6 @@ 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;
diff --git a/Flow.Launcher/CustomShortcutSetting.xaml.cs b/Flow.Launcher/CustomShortcutSetting.xaml.cs
@@ -64,8 +64,6 @@ 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;
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
@@ -319,8 +319,6 @@ public bool IsGameModeOn()
 
         public void ReQuery(bool reselect = true) => _mainVM.ReQuery(reselect);
 
-        public void BackToQueryResults() => _mainVM.BackToQueryResults();
-
         public MessageBoxResult ShowMsgBox(string messageBoxText, string caption = "", MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None, MessageBoxResult defaultResult = MessageBoxResult.OK) =>
             MessageBoxEx.Show(messageBoxText, caption, button, icon, defaultResult);
 
diff --git a/Flow.Launcher/ResultListBox.xaml.cs b/Flow.Launcher/ResultListBox.xaml.cs
@@ -149,11 +149,7 @@ 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)
         {
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -279,10 +279,8 @@ public void ReQuery()
 
         public void ReQuery(bool reselect)
         {
-            if (SelectedIsFromQueryResults())
-            {
-                QueryResults(isReQuery: true, reSelect: reselect);
-            }
+            BackToQueryResults();
+            QueryResults(isReQuery: true, reSelect: reselect);
         }
 
         [RelayCommand]
@@ -491,7 +489,7 @@ private void Esc()
             }
         }
 
-        public void BackToQueryResults()
+        private void BackToQueryResults()
         {
             if (!SelectedIsFromQueryResults())
             {
@@ -610,6 +608,8 @@ public void ChangeQueryText(string queryText, bool isReQuery = false)
         {
             Application.Current.Dispatcher.Invoke(() =>
             {
+                BackToQueryResults();
+
                 if (QueryText != queryText)
                 {
                     // re-query is done in QueryText's setter method
@@ -1266,8 +1266,6 @@ 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;
                     }
@@ -1285,8 +1283,6 @@ 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;
                     }
diff --git a/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs b/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs
@@ -64,8 +64,6 @@ 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();
         }
diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModel/PluginViewModel.cs
@@ -146,8 +146,6 @@ 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();
         }
@@ -161,5 +159,4 @@ private void SetActionKeywords()
             changeKeywordsWindow.ShowDialog();
         }
     }
-
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
@@ -264,7 +264,6 @@ public List<Result> LoadContextMenus(Result selectedResult)
                             Context.API.GetTranslation("flowlauncher_plugin_program_disable_dlgtitle_success"),
                             Context.API.GetTranslation(
                                 "flowlauncher_plugin_program_disable_dlgtitle_success_message"));
-                        Context.API.BackToQueryResults();
                         Context.API.ReQuery();
                         return false;
                     },
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -382,7 +382,6 @@ private void OnWinRPressed()
             {
                 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}");
             });
 

Original file line number	Diff line number	Diff line change
`@@ -170,10 +170,5 @@ public void OpenAppUri(string appUri)`
`170`	`170`	`{`
`171`	`171`	`_api.OpenAppUri(appUri);`
`172`	`172`	`}`
`173`		`-`
`174`		`- public void BackToQueryResults()`
`175`		`- {`
`176`		`- _api.BackToQueryResults();`
`177`		`- }`
`178`	`173`	`}`
`179`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,6 @@ public void UpdateItem(CustomPluginHotkey item)`
`76`	`76`
`77`	`77`	`private void BtnTestActionKeyword_OnClick(object sender, RoutedEventArgs e)`
`78`	`78`	`{`
`79`		`- // if user happens to open context menu, we need to return back to query results before changing query`
`80`		`- App.API.BackToQueryResults();`
`81`	`79`	`App.API.ChangeQuery(tbAction.Text);`
`82`	`80`	`Application.Current.MainWindow.Show();`
`83`	`81`	`Application.Current.MainWindow.Opacity = 1;`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,6 @@ private void cmdEsc_OnPress(object sender, ExecutedRoutedEventArgs e)`
`64`	`64`
`65`	`65`	`private void BtnTestShortcut_OnClick(object sender, RoutedEventArgs e)`
`66`	`66`	`{`
`67`		`- // if user happens to open context menu, we need to return back to query results before changing query`
`68`		`- App.API.BackToQueryResults();`
`69`	`67`	`App.API.ChangeQuery(tbExpand.Text);`
`70`	`68`	`Application.Current.MainWindow.Show();`
`71`	`69`	`Application.Current.MainWindow.Opacity = 1;`
Original file line number	Diff line number	Diff line change
`@@ -149,11 +149,7 @@ private void ResultList_MouseMove(object sender, MouseEventArgs e)`
`149`	`149`	`var rawQuery = query;`
`150`	`150`	`var effect = DragDrop.DoDragDrop((DependencyObject)sender, data, DragDropEffects.Move \| DragDropEffects.Copy);`
`151`	`151`	`if (effect == DragDropEffects.Move)`
`152`		`- {`
`153`		`- // if user happens to open context menu, we need to return back to query results before changing query`
`154`		`- App.API.BackToQueryResults();`
`155`	`152`	`App.API.ChangeQuery(rawQuery, true);`
`156`		`- }`
`157`	`153`	`}`
`158`	`154`	`private void ResultListBox_OnPreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)`
`159`	`155`	`{`
Original file line number	Diff line number	Diff line change
`@@ -279,10 +279,8 @@ public void ReQuery()`
`279`	`279`
`280`	`280`	`public void ReQuery(bool reselect)`
`281`	`281`	`{`
`282`		`- if (SelectedIsFromQueryResults())`
`283`		`- {`
`284`		`- QueryResults(isReQuery: true, reSelect: reselect);`
`285`		`- }`
	`282`	`+ BackToQueryResults();`
	`283`	`+ QueryResults(isReQuery: true, reSelect: reselect);`
`286`	`284`	`}`
`287`	`285`
`288`	`286`	`[RelayCommand]`
`@@ -491,7 +489,7 @@ private void Esc()`
`491`	`489`	`}`
`492`	`490`	`}`
`493`	`491`
`494`		`- public void BackToQueryResults()`
	`492`	`+ private void BackToQueryResults()`
`495`	`493`	`{`
`496`	`494`	`if (!SelectedIsFromQueryResults())`
`497`	`495`	`{`
`@@ -610,6 +608,8 @@ public void ChangeQueryText(string queryText, bool isReQuery = false)`
`610`	`608`	`{`
`611`	`609`	`Application.Current.Dispatcher.Invoke(() =>`
`612`	`610`	`{`
	`611`	`+ BackToQueryResults();`
	`612`	`+`
`613`	`613`	`if (QueryText != queryText)`
`614`	`614`	`{`
`615`	`615`	`// re-query is done in QueryText's setter method`
`@@ -1266,8 +1266,6 @@ private Result ContextMenuTopMost(Result result)`
`1266`	`1266`	`{`
`1267`	`1267`	`_topMostRecord.Remove(result);`
`1268`	`1268`	`App.API.ShowMsg(InternationalizationManager.Instance.GetTranslation("success"));`
`1269`		`- // if user happens to open context menu, we need to return back to query results before changing query`
`1270`		`- App.API.BackToQueryResults();`
`1271`	`1269`	`App.API.ReQuery();`
`1272`	`1270`	`return false;`
`1273`	`1271`	`}`
`@@ -1285,8 +1283,6 @@ private Result ContextMenuTopMost(Result result)`
`1285`	`1283`	`{`
`1286`	`1284`	`_topMostRecord.AddOrUpdate(result);`
`1287`	`1285`	`App.API.ShowMsg(InternationalizationManager.Instance.GetTranslation("success"));`
`1288`		`- // if user happens to open context menu, we need to return back to query results before changing query`
`1289`		`- App.API.BackToQueryResults();`
`1290`	`1286`	`App.API.ReQuery();`
`1291`	`1287`	`return false;`
`1292`	`1288`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,6 @@ public string Category`
`64`	`64`	`private void ShowCommandQuery(string action)`
`65`	`65`	`{`
`66`	`66`	`var actionKeyword = PluginManagerData.Metadata.ActionKeywords.Any() ? PluginManagerData.Metadata.ActionKeywords[0] + " " : String.Empty;`
`67`		`- // if user happens to open context menu, we need to return back to query results before changing query`
`68`		`- App.API.BackToQueryResults();`
`69`	`67`	`App.API.ChangeQuery($"{actionKeyword}{action} {_plugin.Name}");`
`70`	`68`	`App.API.ShowMainWindow();`
`71`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,6 @@ private void OpenSourceCodeLink()`
`146`	`146`	`[RelayCommand]`
`147`	`147`	`private void OpenDeletePluginWindow()`
`148`	`148`	`{`
`149`		`- // if user happens to open context menu, we need to return back to query results before changing query`
`150`		`- PluginManager.API.BackToQueryResults();`
`151`	`149`	`PluginManager.API.ChangeQuery($"{PluginManagerActionKeyword} uninstall {PluginPair.Metadata.Name}".Trim(), true);`
`152`	`150`	`PluginManager.API.ShowMainWindow();`
`153`	`151`	`}`
`@@ -161,5 +159,4 @@ private void SetActionKeywords()`
`161`	`159`	`changeKeywordsWindow.ShowDialog();`
`162`	`160`	`}`
`163`	`161`	`}`
`164`		`-`
`165`	`162`	`}`