Use EtoInvoker instead of SyncContextInvoker

cyanfish · Dec 8, 2023 · fdcec85 · fdcec85
1 parent 7870de3
commit fdcec85
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 40 deletions.
diff --git a/NAPS2.Lib.Gtk/EtoForms/Ui/GtkDesktopForm.cs b/NAPS2.Lib.Gtk/EtoForms/Ui/GtkDesktopForm.cs
@@ -71,8 +71,6 @@ public GtkDesktopForm(
 
     protected override void OnLoad(EventArgs e)
     {
-        // TODO: What's the best place to initialize this? It needs to happen from the UI event loop.
-        Invoker.Current = new SyncContextInvoker(SynchronizationContext.Current!);
         base.OnLoad(e);
         var listView = (GtkListView<UiImage>) _listView;
         listView.NativeControl.StyleContext.AddClass("desktop-listview");

diff --git a/NAPS2.Lib.Mac/EtoForms/Ui/MacDesktopForm.cs b/NAPS2.Lib.Mac/EtoForms/Ui/MacDesktopForm.cs
@@ -38,13 +38,6 @@ public MacDesktopForm(
         _thumbnailController.Oversample = 2.0;
     }
 
-    protected override void OnLoad(EventArgs e)
-    {
-        // TODO: What's the best place to initialize this? It needs to happen from the UI event loop.
-        Invoker.Current = new SyncContextInvoker(SynchronizationContext.Current!);
-        base.OnLoad(e);
-    }
-
     protected override void UpdateTitle(ScanProfile? defaultProfile)
     {
         Title = UiStrings.Naps2;

diff --git a/NAPS2.Lib/EtoForms/EtoPlatform.cs b/NAPS2.Lib/EtoForms/EtoPlatform.cs
@@ -38,12 +38,12 @@ public virtual void InitializePlatform()
 
     public virtual void RunApplication(Application application, Form mainForm)
     {
+        Invoker.Current = new EtoInvoker(application);
         application.Run(mainForm);
     }
 
     public virtual void RunApplication(Application application)
     {
-        // TODO: Can we use EtoInvoker more generally and get rid of some of the platform-specific stuff?
         Invoker.Current = new EtoInvoker(application);
         application.Run();
     }

diff --git a/NAPS2.Sdk/Threading/SyncContextInvoker.cs b/NAPS2.Sdk/Threading/SyncContextInvoker.cs