diff --git a/Plugins/Wox.Plugin.WebSearch/WebSearchPlugin.cs b/Plugins/Wox.Plugin.WebSearch/WebSearchPlugin.cs index aa327f6674..f3e9837d65 100644 --- a/Plugins/Wox.Plugin.WebSearch/WebSearchPlugin.cs +++ b/Plugins/Wox.Plugin.WebSearch/WebSearchPlugin.cs @@ -44,7 +44,7 @@ namespace Wox.Plugin.WebSearch return true; } } - },true); + }); if (UserSettingStorage.Instance.EnableWebSearchSuggestion && !string.IsNullOrEmpty(keyword)) { diff --git a/Wox.Plugin/IPublicAPI.cs b/Wox.Plugin/IPublicAPI.cs index 40ce63ef53..972d281f92 100644 --- a/Wox.Plugin/IPublicAPI.cs +++ b/Wox.Plugin/IPublicAPI.cs @@ -15,8 +15,7 @@ namespace Wox.Plugin /// /// /// - /// - void PushResults(Query query,PluginMetadata plugin, List results,bool clearBeforeInsert = false); + void PushResults(Query query,PluginMetadata plugin, List results); /// /// Execute command diff --git a/Wox/MainWindow.xaml b/Wox/MainWindow.xaml index 61cf46742e..bed65cd9ab 100644 --- a/Wox/MainWindow.xaml +++ b/Wox/MainWindow.xaml @@ -18,10 +18,11 @@ - + - - + + diff --git a/Wox/MainWindow.xaml.cs b/Wox/MainWindow.xaml.cs index 366134aa71..4f14984be8 100644 --- a/Wox/MainWindow.xaml.cs +++ b/Wox/MainWindow.xaml.cs @@ -136,21 +136,23 @@ namespace Wox public event AfterWoxQueryEventHandler AfterWoxQueryEvent; public event AfterWoxQueryEventHandler BeforeWoxQueryEvent; - public void PushResults(Query query, PluginMetadata plugin, List results, bool clearBeforeInsert = false) + public void PushResults(Query query, PluginMetadata plugin, List results) { results.ForEach(o => { o.PluginDirectory = plugin.PluginDirectory; + o.PluginID = plugin.ID; + o.OriginQuery = query; if (o.ContextMenu != null) { o.ContextMenu.ForEach(t => { t.PluginDirectory = plugin.PluginDirectory; + t.PluginID = plugin.ID; }); } - o.OriginQuery = query; }); - OnUpdateResultView(results, clearBeforeInsert); + UpdateResultView(results); } #endregion @@ -635,7 +637,7 @@ namespace Wox } } - private void OnUpdateResultView(List list, bool clearBeforeInsert = false) + private void UpdateResultView(List list) { queryHasReturn = true; progressBar.Dispatcher.Invoke(new Action(StopProgress)); @@ -650,10 +652,6 @@ namespace Wox List l = list.Where(o => o.OriginQuery != null && o.OriginQuery.RawQuery == lastQuery).ToList(); Dispatcher.Invoke(new Action(() => { - if (clearBeforeInsert) - { - pnlResult.Clear(); - } pnlResult.AddResults(l); })); }