From 0f203531d938fc39e0b8c99274cf35ccf844b5a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Aug 2022 17:37:43 +0900
Subject: [PATCH] Allow customising the "close" button icon

---
 osu.Game/Overlays/Notifications/Notification.cs     | 13 +++++++++++--
 .../Overlays/Notifications/ProgressNotification.cs  |  5 ++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 5cd0db628d..2b57423305 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -56,6 +56,8 @@ namespace osu.Game.Overlays.Notifications
 
         public virtual bool Read { get; set; }
 
+        protected virtual IconUsage CloseButtonIcon => FontAwesome.Solid.Check;
+
         protected Notification()
         {
             RelativeSizeAxes = Axes.X;
@@ -116,7 +118,7 @@ namespace osu.Game.Overlays.Notifications
                                             },
                                         }
                                     },
-                                    new CloseButton
+                                    new CloseButton(CloseButtonIcon)
                                     {
                                         Action = Close,
                                         Anchor = Anchor.TopRight,
@@ -177,9 +179,16 @@ namespace osu.Game.Overlays.Notifications
             private SpriteIcon icon = null!;
             private Box background = null!;
 
+            private readonly IconUsage iconUsage;
+
             [Resolved]
             private OverlayColourProvider colourProvider { get; set; } = null!;
 
+            public CloseButton(IconUsage iconUsage)
+            {
+                this.iconUsage = iconUsage;
+            }
+
             [BackgroundDependencyLoader]
             private void load()
             {
@@ -198,7 +207,7 @@ namespace osu.Game.Overlays.Notifications
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        Icon = FontAwesome.Solid.Check,
+                        Icon = iconUsage,
                         Size = new Vector2(12),
                         Colour = colourProvider.Foreground1,
                     }
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index 6390d9a54f..594537bce7 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -61,7 +61,10 @@ namespace osu.Game.Overlays.Notifications
             }
         }
 
-        private void updateProgress(float progress) => progressBar.Progress = progress;
+        protected override IconUsage CloseButtonIcon => FontAwesome.Solid.Times;
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
 
         protected override void LoadComplete()
         {