rename NotificationHelper to RyujinxNotificationManager,

rename instance method names. Additionally clarified what the math is in the notification manager margin parameter.
2026-05-26 06:59:15 +00:00 · 2025-11-26 17:12:35 -06:00
parent 2f794794c6
commit d8a6364cca
12 changed files with 49 additions and 40 deletions
--- a/src/Ryujinx/UI/Helpers/RyujinxNotificationManager.cs
+++ b/src/Ryujinx/UI/Helpers/RyujinxNotificationManager.cs
@@ -0,0 +1,179 @@
+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 class RyujinxNotificationManager
+    {
+        public static RyujinxNotificationManager Shared { get; set; }
+
+        public const int MaxNotifications = 4;
+        private const int NotificationDelayInMs = 5000;
+
+        private readonly WindowNotificationManager _notificationManager;
+
+        private readonly BlockingCollection<Notification> _notifications = new();
+
+        public RyujinxNotificationManager(Window host,
+            NotificationPosition visiblePosition = NotificationPosition.BottomRight,
+            int maxItems = MaxNotifications, 
+            Thickness? margin = null)
+        {
+            _notificationManager = new WindowNotificationManager(host)
+            {
+                Position = visiblePosition,
+                MaxItems = maxItems,
+                Margin = margin ?? new Thickness(0, 0, 15, 40)
+            };
+
+            Lazy<AsyncWorkQueue<Notification>> maybeAsyncWorkQueue = new(
+                () => 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)
+            => Shared?.Send(title, text, type, waitingExit, onClick, onClose);
+
+        public void Send(string title, string text, NotificationType type, bool waitingExit = false,
+            Action onClick = null, Action onClose = null)
+        {
+            TimeSpan delay = waitingExit
+                ? TimeSpan.FromMilliseconds(0)
+                : TimeSpan.FromMilliseconds(NotificationDelayInMs);
+
+            _notifications.Add(new Notification(title, text, type, delay, onClick, onClose));
+        }
+
+        #region Instance notification senders
+
+        public void Information(string title, string text, bool waitingExit = false, Action onClick = null,
+            Action onClose = null) =>
+            Send(
+                title,
+                text,
+                NotificationType.Information,
+                waitingExit,
+                onClick,
+                onClose);
+
+        public void Success(string title, string text, bool waitingExit = false, Action onClick = null,
+            Action onClose = null) =>
+            Send(
+                title,
+                text,
+                NotificationType.Success,
+                waitingExit,
+                onClick,
+                onClose);
+
+        public void Warning(string title, string text, bool waitingExit = false, Action onClick = null,
+            Action onClose = null) =>
+            Send(
+                title,
+                text,
+                NotificationType.Warning,
+                waitingExit,
+                onClick,
+                onClose);
+
+        public void Error(string title, string text, bool waitingExit = false, Action onClick = null,
+            Action onClose = null) =>
+            Send(
+                title,
+                text,
+                NotificationType.Error,
+                waitingExit,
+                onClick,
+                onClose);
+
+        public void Error(string message, bool waitingExit = false) =>
+            Error(
+                LocaleManager.Instance[LocaleKeys.DialogErrorTitle],
+                $"{LocaleManager.Instance[LocaleKeys.DialogErrorMessage]}\n\n{message}",
+                waitingExit: waitingExit
+            );
+
+        #endregion
+
+        #region Static notification senders
+
+        public static void ShowInformation(string title, string text, bool waitingExit = false, Action onClick = null,
+            Action onClose = null) =>
+            Show(
+                title,
+                text,
+                NotificationType.Information,
+                waitingExit,
+                onClick,
+                onClose);
+
+        public static void ShowSuccess(string title, string text, bool waitingExit = false, Action onClick = null,
+            Action onClose = null) =>
+            Show(
+                title,
+                text,
+                NotificationType.Success,
+                waitingExit,
+                onClick,
+                onClose);
+
+        public static void ShowWarning(string title, string text, bool waitingExit = false, Action onClick = null,
+            Action onClose = null) =>
+            Show(
+                title,
+                text,
+                NotificationType.Warning,
+                waitingExit,
+                onClick,
+                onClose);
+
+        public static void ShowError(string title, string text, bool waitingExit = false, Action onClick = null,
+            Action onClose = null) =>
+            Show(
+                title,
+                text,
+                NotificationType.Error,
+                waitingExit,
+                onClick,
+                onClose);
+
+        public static void ShowError(string message, bool waitingExit = false) =>
+            ShowError(
+                LocaleManager.Instance[LocaleKeys.DialogErrorTitle],
+                $"{LocaleManager.Instance[LocaleKeys.DialogErrorMessage]}\n\n{message}",
+                waitingExit: waitingExit
+            );
+
+        #endregion
+    }
+}