From 433974323c92df2dadca0c4a89d0b7d151136cc2 Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Thu, 28 Jul 2022 11:17:29 -0600 Subject: [PATCH] Remove unnecessary extensions --- Source/LibationAvalonia/AvaloniaThreadUtils.cs | 6 ------ Source/LibationAvalonia/AvaloniaUtils.cs | 2 +- Source/LibationAvalonia/MessageBox.cs | 4 ++-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Source/LibationAvalonia/AvaloniaThreadUtils.cs b/Source/LibationAvalonia/AvaloniaThreadUtils.cs index 93213183..b5683223 100644 --- a/Source/LibationAvalonia/AvaloniaThreadUtils.cs +++ b/Source/LibationAvalonia/AvaloniaThreadUtils.cs @@ -12,12 +12,6 @@ namespace Avalonia.Threading public static void Invoke(this Dispatcher dispatcher, Action action, DispatcherPriority dispatcherPriority = DispatcherPriority.Normal) => WaitOnDispatcher(dispatcher.InvokeAsync(action, dispatcherPriority), dispatcher); - public static TResult WaitOnUIAndGetResult(this Task task) - => WaitOnDispatcherAndGetResult(task, Dispatcher.UIThread); - - public static void WaitOnUI(this Task task) - => WaitOnDispatcher(task, Dispatcher.UIThread); - public static TResult WaitOnDispatcherAndGetResult(this Task task, Dispatcher dispatcher) { using var source = new CancellationTokenSource(); diff --git a/Source/LibationAvalonia/AvaloniaUtils.cs b/Source/LibationAvalonia/AvaloniaUtils.cs index 6efc93a5..906bfe61 100644 --- a/Source/LibationAvalonia/AvaloniaUtils.cs +++ b/Source/LibationAvalonia/AvaloniaUtils.cs @@ -19,7 +19,7 @@ namespace LibationAvalonia public static T ShowDialogSynchronously(this Avalonia.Controls.Window window, Avalonia.Controls.Window owner) { - return window.ShowDialog(owner).WaitOnUIAndGetResult(); + return window.ShowDialog(owner).WaitOnDispatcherAndGetResult(Dispatcher.UIThread); } } } diff --git a/Source/LibationAvalonia/MessageBox.cs b/Source/LibationAvalonia/MessageBox.cs index 3ad00a8f..26de6e0f 100644 --- a/Source/LibationAvalonia/MessageBox.cs +++ b/Source/LibationAvalonia/MessageBox.cs @@ -151,9 +151,9 @@ Libation. private static DialogResult ShowCoreAsync(Window owner, string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool saveAndRestorePosition = true) { - var dialogTask = Dispatcher.UIThread.Invoke(() => CreateMessageBox(owner, message, caption, buttons, icon, defaultButton, saveAndRestorePosition)); + var dialog = Dispatcher.UIThread.Invoke(() => CreateMessageBox(owner, message, caption, buttons, icon, defaultButton, saveAndRestorePosition)); - return DisplayWindow(dialogTask, owner); + return DisplayWindow(dialog, owner); } private static MessageBoxWindow CreateMessageBox(Window owner, string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool saveAndRestorePosition = true)