fix(winui): Adjust DispatcherQueue implementation

unoplatform · Nov 5, 2021 · 263f914 · 263f914
1 parent a7c9943
commit 263f914
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 161 deletions.
diff --git a/src/Uno.UI.Runtime.Skia.Gtk/GtkHost.cs b/src/Uno.UI.Runtime.Skia.Gtk/GtkHost.cs
@@ -91,15 +91,6 @@ public void Run()
 				Gtk.Application.Quit();
 			};
 
-			bool EnqueueNative(DispatcherQueuePriority priority, DispatcherQueueHandler callback)
-			{
-				Dispatch(() => callback());
-
-				return true;
-			}
-
-			Windows.System.DispatcherQueue.EnqueueNativeOverride = EnqueueNative;
-
 			void Dispatch(System.Action d)
 			{
 				if (Gtk.Application.EventsPending())

diff --git a/src/Uno.UI.Runtime.Skia.Linux.FrameBuffer/FramebufferHost.cs b/src/Uno.UI.Runtime.Skia.Linux.FrameBuffer/FramebufferHost.cs
@@ -55,7 +55,6 @@ void Dispatch(System.Action d)
 				_eventLoop.Schedule(() => d());
 			}
 
-			Windows.System.DispatcherQueue.EnqueueNativeOverride = EnqueueNative;
 			Windows.UI.Core.CoreDispatcher.DispatchOverride = Dispatch;
 			Windows.UI.Core.CoreDispatcher.HasThreadAccessOverride = () => _isDispatcherThread;
 

diff --git a/src/Uno.UI.Runtime.Skia.Tizen/TizenHost.cs b/src/Uno.UI.Runtime.Skia.Tizen/TizenHost.cs
@@ -76,8 +76,6 @@ bool EnqueueNative(DispatcherQueuePriority priority, DispatcherQueueHandler call
 				return true;
 			}
 
-			Windows.System.DispatcherQueue.EnqueueNativeOverride = EnqueueNative;
-
 			Windows.UI.Core.CoreDispatcher.DispatchOverride = (d) => EcoreMainloop.PostAndWakeUp(d);
 			Windows.UI.Core.CoreDispatcher.HasThreadAccessOverride = () => EcoreMainloop.IsMainThread;
 

diff --git a/src/Uno.UI.Runtime.Skia.Wpf/WpfHost.cs b/src/Uno.UI.Runtime.Skia.Wpf/WpfHost.cs
@@ -118,8 +118,6 @@ bool EnqueueNative(DispatcherQueuePriority priority, DispatcherQueueHandler call
 				return true;
 			}
 
-			Windows.System.DispatcherQueue.EnqueueNativeOverride = EnqueueNative;
-
 			Windows.UI.Core.CoreDispatcher.DispatchOverride = d => dispatcher.BeginInvoke(d);
 			Windows.UI.Core.CoreDispatcher.HasThreadAccessOverride = dispatcher.CheckAccess;
 

diff --git a/src/Uno.UWP/System/DispatcherQueue.Android.cs b/src/Uno.UWP/System/DispatcherQueue.Android.cs
diff --git a/src/Uno.UWP/System/DispatcherQueue.cs b/src/Uno.UWP/System/DispatcherQueue.cs
@@ -52,12 +52,21 @@ internal static void CheckThreadAccess()
 		}
 
 		public bool TryEnqueue(DispatcherQueueHandler callback)
-		{
-			return TryEnqueue(DispatcherQueuePriority.Normal, callback);
-		}
+			=> TryEnqueue(DispatcherQueuePriority.Normal, callback);
+
 		public bool TryEnqueue(DispatcherQueuePriority priority, DispatcherQueueHandler callback)
 		{
-			return TryEnqueueNative(priority, callback);
+			var p = priority switch
+			{
+				DispatcherQueuePriority.Normal => CoreDispatcherPriority.Normal,
+				DispatcherQueuePriority.High => CoreDispatcherPriority.High,
+				DispatcherQueuePriority.Low => CoreDispatcherPriority.Low,
+				_ => CoreDispatcherPriority.Normal
+			};
+
+			CoreDispatcher.Main.RunAsync(p, () => callback());
+
+			return true;
 		}
 
 		public bool HasThreadAccess

diff --git a/src/Uno.UWP/System/DispatcherQueue.iOSmacOS.cs b/src/Uno.UWP/System/DispatcherQueue.iOSmacOS.cs
diff --git a/src/Uno.UWP/System/DispatcherQueue.net.cs b/src/Uno.UWP/System/DispatcherQueue.net.cs
diff --git a/src/Uno.UWP/System/DispatcherQueue.netstdref.cs b/src/Uno.UWP/System/DispatcherQueue.netstdref.cs
diff --git a/src/Uno.UWP/System/DispatcherQueue.skia.cs b/src/Uno.UWP/System/DispatcherQueue.skia.cs
diff --git a/src/Uno.UWP/System/DispatcherQueue.wasm.cs b/src/Uno.UWP/System/DispatcherQueue.wasm.cs