fix some legacy code from #195

Author: taooceros

Flow.Launcher/PublicAPIInstance.cs

@@ -92,6 +92,7 @@ public void ShowMsg(string title, string subTitle, string iconPath, bool useMain
         {
             Application.Current.Dispatcher.Invoke(() =>
             {
+                useMainWindowAsOwner = false;
                 var msg = useMainWindowAsOwner ? new Msg { Owner = Application.Current.MainWindow } : new Msg();
                 msg.Show(title, subTitle, iconPath);
             });

Flow.Launcher/ViewModel/ResultsViewModel.cs

@@ -139,39 +139,9 @@ public void KeepResultsExcept(PluginMetadata metadata)
         /// </summary>
         public void AddResults(List<Result> newRawResults, string resultId)
         {
-            lock (_collectionLock)
-            {
-                var newResults = NewResults(newRawResults, resultId);
-
-                // https://social.msdn.microsoft.com/Forums/vstudio/en-US/5ff71969-f183-4744-909d-50f7cd414954/binding-a-tabcontrols-selectedindex-not-working?forum=wpf
-                // fix selected index flow
-                var updateTask = Task.Run(() =>
-                {
-                    // update UI in one run, so it can avoid UI flickering
-
-                    Results.Update(newResults);
-                    if (Results.Any())
-                        SelectedItem = Results[0];
-                });
-                if (!updateTask.Wait(300))
-                {
-                    updateTask.Dispose();
-                    throw new TimeoutException("Update result use too much time.");
-                }
+            var newResults = NewResults(newRawResults, resultId);
 
-            }
-
-            if (Visbility != Visibility.Visible && Results.Count > 0)
-            {
-                Margin = new Thickness { Top = 8 };
-                SelectedIndex = 0;
-                Visbility = Visibility.Visible;
-            }
-            else
-            {
-                Margin = new Thickness { Top = 0 };
-                Visbility = Visibility.Collapsed;
-            }
+            UpdateResults(newResults);
         }
         /// <summary>
         /// To avoid deadlock, this method should not called from main thread
@@ -181,10 +151,15 @@ public void AddResults(IEnumerable<ResultsForUpdate> resultsForUpdates, Cancella
             var newResults = NewResults(resultsForUpdates);
             if (token.IsCancellationRequested)
                 return;
+            UpdateResults(newResults, token);
+
+        }
+
+        private void UpdateResults(List<ResultViewModel> newResults, CancellationToken token = default)
+        {
             lock (_collectionLock)
             {
                 // update UI in one run, so it can avoid UI flickering
-
                 Results.Update(newResults, token);
                 if (Results.Any())
                     SelectedItem = Results[0];
@@ -202,7 +177,6 @@ public void AddResults(IEnumerable<ResultsForUpdate> resultsForUpdates, Cancella
                     Visbility = Visibility.Collapsed;
                     break;
             }
-
         }
 
         private List<ResultViewModel> NewResults(List<Result> newRawResults, string resultId)
@@ -212,10 +186,10 @@ private List<ResultViewModel> NewResults(List<Result> newRawResults, string resu
 
             var results = Results as IEnumerable<ResultViewModel>;
 
-            var newResults = newRawResults.Select(r => new ResultViewModel(r, _settings)).ToList();
+            var newResults = newRawResults.Select(r => new ResultViewModel(r, _settings));
 
             return results.Where(r => r.Result.PluginID != resultId)
-                .Concat(results.Intersect(newResults).Union(newResults))
+                .Concat(newResults)
                 .OrderByDescending(r => r.Result.Score)
                 .ToList();
         }
@@ -228,8 +202,7 @@ private List<ResultViewModel> NewResults(IEnumerable<ResultsForUpdate> resultsFo
             var results = Results as IEnumerable<ResultViewModel>;
 
             return results.Where(r => r != null && !resultsForUpdates.Any(u => u.Metadata.ID == r.Result.PluginID))
-                          .Concat(
-                               resultsForUpdates.SelectMany(u => u.Results, (u, r) => new ResultViewModel(r, _settings)))
+                          .Concat(resultsForUpdates.SelectMany(u => u.Results, (u, r) => new ResultViewModel(r, _settings)))
                           .OrderByDescending(rv => rv.Result.Score)
                           .ToList();
         }