Replace DelayInvoke with Task + Async

Wox/Helper/DispatcherExtensions.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Windows.Threading;
-
-namespace Wox
-{
-    public static class DispatcherExtensions
-    {
-        private static Dictionary<string, DispatcherTimer> timers =
-            new Dictionary<string, DispatcherTimer>();
-        private static readonly object syncRoot = new object();
-
-        public static void DelayInvoke(this Dispatcher dispatcher, string namedInvocation,
-            Action action, TimeSpan delay,
-            DispatcherPriority priority = DispatcherPriority.Normal)
-        {
-            lock (syncRoot)
-            {
-                if (string.IsNullOrEmpty(namedInvocation))
-                {
-                    namedInvocation = Guid.NewGuid().ToString();
-                }
-                else
-                {
-                    RemoveTimer(namedInvocation);
-                }
-                var timer = new DispatcherTimer(delay, priority, (s, e) =>
-                {
-                    RemoveTimer(namedInvocation);
-                    action();
-                }, dispatcher);
-                timer.Start();
-                timers.Add(namedInvocation, timer);
-            }
-        }
-
-
-        public static void CancelNamedInvocation(this Dispatcher dispatcher, string namedInvocation)
-        {
-            lock (syncRoot)
-            {
-                RemoveTimer(namedInvocation);
-            }
-        }
-
-        private static void RemoveTimer(string namedInvocation)
-        {
-            if (!timers.ContainsKey(namedInvocation)) return;
-            timers[namedInvocation].Stop();
-            timers.Remove(namedInvocation);
-        }
-
-    }
-}

Wox/HotkeyControl.xaml.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -52,12 +53,11 @@ namespace Wox
                 return;
             }
 
-            Dispatcher.DelayInvoke("HotkeyAvailabilityTest", 
+            Dispatcher.InvokeAsync(async () =>
-                () =>
             {
+                await Task.Delay(500);
                 SetHotkey(hotkeyModel);
-                },
+            });
-                TimeSpan.FromMilliseconds(500));
         }
 
         public void SetHotkey(HotkeyModel keyModel, bool triggerValidate = true)

Wox/MainWindow.xaml.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Net;
 using System.Reflection;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -484,13 +485,14 @@ namespace Wox
                     }
                 }
                 _lastQuery = query;
-                Dispatcher.DelayInvoke("ShowProgressbar", () =>
+                Dispatcher.InvokeAsync(async () =>
                 {
+                    await Task.Delay(150);
                     if (!string.IsNullOrEmpty(query.RawQuery) && query.RawQuery == _lastQuery.RawQuery && !_queryHasReturn)
                     {
                         StartProgress();
                     }
-                }, TimeSpan.FromMilliseconds(150));
+                });
                 PluginManager.QueryForAllPlugins(query);
             }
             StopProgress();
@@ -829,6 +831,7 @@ namespace Wox
 
         private void UpdateResultView(List<Result> list, PluginMetadata metadata, Query originQuery)
         {
+            Thread.Sleep(3000);
             _queryHasReturn = true;
             progressBar.Dispatcher.Invoke(new Action(StopProgress));
 

Wox/Msg.xaml.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Forms;
 using System.Windows.Input;
@@ -7,12 +8,15 @@ using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 using Wox.Helper;
 
-namespace Wox {
+namespace Wox
-	public partial class Msg : Window {
+{
+    public partial class Msg : Window
+    {
         Storyboard fadeOutStoryboard = new Storyboard();
         private bool closing = false;
 
-		public Msg() {
+        public Msg()
+        {
             InitializeComponent();
             var screen = Screen.FromPoint(System.Windows.Forms.Cursor.Position);
             var dipWorkingArea = WindowIntelopHelper.TransformPixelsToDIP(this,
@@ -25,7 +29,8 @@ namespace Wox {
 
             // Create the fade out storyboard
             fadeOutStoryboard.Completed += new EventHandler(fadeOutStoryboard_Completed);
-			DoubleAnimation fadeOutAnimation = new DoubleAnimation(dipWorkingArea.Y - Height, dipWorkingArea.Y, new Duration(TimeSpan.FromSeconds(0.3))) {
+            DoubleAnimation fadeOutAnimation = new DoubleAnimation(dipWorkingArea.Y - Height, dipWorkingArea.Y, new Duration(TimeSpan.FromSeconds(0.3)))
+            {
                 AccelerationRatio = 0.2
             };
             Storyboard.SetTarget(fadeOutAnimation, this);
@@ -38,25 +43,30 @@ namespace Wox {
             imgClose.MouseUp += imgClose_MouseUp;
         }
 
-		void imgClose_MouseUp(object sender, MouseButtonEventArgs e) {
+        void imgClose_MouseUp(object sender, MouseButtonEventArgs e)
-			if (!closing) {
+        {
+            if (!closing)
+            {
                 closing = true;
                 fadeOutStoryboard.Begin();
             }
         }
 
-		private void fadeOutStoryboard_Completed(object sender, EventArgs e) {
+        private void fadeOutStoryboard_Completed(object sender, EventArgs e)
+        {
             Close();
         }
 
-		public void Show(string title, string subTitle, string icopath) {
+        public void Show(string title, string subTitle, string icopath)
+        {
             tbTitle.Text = title;
             tbSubTitle.Text = subTitle;
             if (string.IsNullOrEmpty(subTitle))
             {
                 tbSubTitle.Visibility = Visibility.Collapsed;
             }
-			if (!File.Exists(icopath)) {
+            if (!File.Exists(icopath))
+            {
                 imgIco.Source = new BitmapImage(new Uri("Images\\app.png", UriKind.Relative));
             }
             else {
@@ -65,13 +75,14 @@ namespace Wox {
 
             Show();
 
-			Dispatcher.DelayInvoke("ShowMsg",
+            Dispatcher.InvokeAsync(async () =>
-								   () => {
+                                   {
-								            if (!closing) {
+                                       if (!closing)
+                                       {
                                            closing = true;
-								                Dispatcher.Invoke(new Action(fadeOutStoryboard.Begin));
+                                           await Dispatcher.InvokeAsync(fadeOutStoryboard.Begin);
                                        }
-								   }, TimeSpan.FromSeconds(3));
+                                   });
         }
     }
 }

Wox/ResultPanel.xaml.cs

@@ -266,10 +266,10 @@ namespace Wox
             if (e.AddedItems.Count > 0 && e.AddedItems[0] != null)
             {
                 lbResults.ScrollIntoView(e.AddedItems[0]);
-                Dispatcher.DelayInvoke("UpdateItemNumber", () =>
+                //Dispatcher.DelayInvoke("UpdateItemNumber", () =>
-                {
+                //{
-                    UpdateItemNumber();
+                    //UpdateItemNumber();
-                }, TimeSpan.FromMilliseconds(3));
+                //}, TimeSpan.FromMilliseconds(3));
             }
         }
 

Wox/Wox.csproj

@@ -126,14 +126,6 @@
     <Compile Include="Helper\ListBoxItems.cs" />
     <Compile Include="Helper\SingletonWindowOpener.cs" />
     <Compile Include="ImageLoader\ImageCacheStroage.cs" />
-    <Compile Include="ShellContext\ShellContextMenuManager.cs" />
-    <Compile Include="ShellContext\ShellAPI.cs" />
-    <Compile Include="ShellContext\Enums.cs" />
-    <Compile Include="ShellContext\Guids.cs" />
-    <Compile Include="ShellContext\IContextMenu.cs" />
-    <Compile Include="ShellContext\IEnumIDList.cs" />
-    <Compile Include="ShellContext\IShellFolder.cs" />
-    <Compile Include="ShellContext\Structs.cs" />
     <Compile Include="Storage\QueryHistoryStorage.cs" />
     <Compile Include="Storage\TopMostRecordStorage.cs" />
     <Compile Include="Storage\UserSelectedRecordStorage.cs" />
@@ -163,7 +155,6 @@
     <Compile Include="CustomQueryHotkeySetting.xaml.cs">
       <DependentUpon>CustomQueryHotkeySetting.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Helper\DispatcherExtensions.cs" />
     <Compile Include="Helper\DWMDropShadow.cs" />
     <Compile Include="HotkeyControl.xaml.cs">
       <DependentUpon>HotkeyControl.xaml</DependentUpon>