42b9c1e8fe
* Attempt at fixing hang on exit by ending the WindowNotificationManager notification loop, so that the Thread running it can exit. * explicitly apply the NotificationManager template to allow the notification loop to begin * NotificationHelper - remove explicity call to ApplyTemplate(). Change to ManualResetEventSlim so we can cancel the Wait on it. * add a timeout to AudioRenderSystem.Stop()'s waiting for the termination signal, log a warning if this timeout occurs, and continue execution * NotifiationHelper - cancel first, the CompleteAdding() * Remove AudioRenderSystem._terminationEvent, redundant * NotificationHelper - use host.Closing event to trigger cancellation instead of _notifationManager.DetachedFromLogicalTree * Change NotificationHelper to use an explicit Thread for background work. Wait on the cancellationToken's WaitHandle so the Thread doesn't have to deal with async. Wrap foreach in try/catch (OperationCanceledException) to swallow the escaping exception from the GetConsumingEnumerable(). * adjust formatting of AsyncWorkQueue constructor to use object initializers consistently * use AsyncWorkQueue to do everything I added in SetNotificationManager() * Revert "use AsyncWorkQueue to do everything I added in SetNotificationManager()" This reverts commit f0e78366b8776ec8e2fef8ab023c0db1833155d3. * use AsyncWorkQueue to handle the Thread-related changes previously made to NotificationHelper.SetNotificationHelper(). Wrap it in Lazy<T> and force instantiation in the TemplateApplied event handler to accomodate for the fact that AsyncWorkQueue starts immediately, and the notification dispatch loop was being delayed by _templateAppliedEvent. * impl changes suggested by AcK77 * impl changes suggested by AcK77 (more)
70 lines
2.5 KiB
C#
70 lines
2.5 KiB
C#
using Avalonia;
|
|
using Avalonia.Controls;
|
|
using Avalonia.Controls.Notifications;
|
|
using Avalonia.Threading;
|
|
using Ryujinx.Ava.Common.Locale;
|
|
using Ryujinx.Common;
|
|
using System;
|
|
using System.Collections.Concurrent;
|
|
using System.Threading;
|
|
|
|
namespace Ryujinx.Ava.UI.Helpers
|
|
{
|
|
public static class NotificationHelper
|
|
{
|
|
private const int MaxNotifications = 4;
|
|
private const int NotificationDelayInMs = 5000;
|
|
|
|
private static WindowNotificationManager _notificationManager;
|
|
|
|
private static readonly BlockingCollection<Notification> _notifications = new();
|
|
|
|
public static void SetNotificationManager(Window host)
|
|
{
|
|
_notificationManager = new WindowNotificationManager(host)
|
|
{
|
|
Position = NotificationPosition.BottomRight,
|
|
MaxItems = MaxNotifications,
|
|
Margin = new Thickness(0, 0, 15, 40)
|
|
};
|
|
|
|
var maybeAsyncWorkQueue = new Lazy<AsyncWorkQueue<Notification>>(
|
|
() => new AsyncWorkQueue<Notification>(notification =>
|
|
{
|
|
Dispatcher.UIThread.Post(() =>
|
|
{
|
|
_notificationManager.Show(notification);
|
|
});
|
|
},
|
|
"UI.NotificationThread",
|
|
_notifications),
|
|
LazyThreadSafetyMode.ExecutionAndPublication);
|
|
|
|
_notificationManager.TemplateApplied += (sender, args) =>
|
|
{
|
|
// NOTE: Force creation of the AsyncWorkQueue.
|
|
_ = maybeAsyncWorkQueue.Value;
|
|
};
|
|
|
|
host.Closing += (sender, args) =>
|
|
{
|
|
if (maybeAsyncWorkQueue.IsValueCreated)
|
|
{
|
|
maybeAsyncWorkQueue.Value.Dispose();
|
|
}
|
|
};
|
|
}
|
|
|
|
public static void Show(string title, string text, NotificationType type, bool waitingExit = false, Action onClick = null, Action onClose = null)
|
|
{
|
|
var delay = waitingExit ? TimeSpan.FromMilliseconds(0) : TimeSpan.FromMilliseconds(NotificationDelayInMs);
|
|
|
|
_notifications.Add(new Notification(title, text, type, delay, onClick, onClose));
|
|
}
|
|
|
|
public static void ShowError(string message)
|
|
{
|
|
Show(LocaleManager.Instance[LocaleKeys.DialogErrorTitle], $"{LocaleManager.Instance[LocaleKeys.DialogErrorMessage]}\n\n{message}", NotificationType.Error);
|
|
}
|
|
}
|
|
} |