From 808b45ac645ce2488dff52de7f55428f386e4044 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 May 2019 11:50:03 +0900
Subject: [PATCH] Allow custom icon specification in ScreenTitle

Not all icons are available in fonts so IconUsage alone is not enough to cover all scenarios.
---
 .../Graphics/UserInterface/ScreenTitle.cs     | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/ScreenTitle.cs b/osu.Game/Graphics/UserInterface/ScreenTitle.cs
index 3c3aa8fe85..7b39238e5e 100644
--- a/osu.Game/Graphics/UserInterface/ScreenTitle.cs
+++ b/osu.Game/Graphics/UserInterface/ScreenTitle.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -12,14 +13,24 @@ namespace osu.Game.Graphics.UserInterface
 {
     public abstract class ScreenTitle : CompositeDrawable, IHasAccentColour
     {
-        private readonly SpriteIcon iconSprite;
+        public const float ICON_WIDTH = ICON_SIZE + icon_spacing;
+
+        protected const float ICON_SIZE = 25;
+
+        private SpriteIcon iconSprite;
         private readonly OsuSpriteText titleText, pageText;
-        public const float ICON_WIDTH = icon_size + icon_spacing;
-        private const float icon_size = 25, icon_spacing = 10;
+
+        private const float icon_spacing = 10;
 
         protected IconUsage Icon
         {
-            set => iconSprite.Icon = value;
+            set
+            {
+                if (iconSprite == null)
+                    throw new InvalidOperationException($"Cannot use {nameof(Icon)} with a custom {nameof(CreateIcon)} function.");
+
+                iconSprite.Icon = value;
+            }
         }
 
         protected string Title
@@ -38,6 +49,11 @@ namespace osu.Game.Graphics.UserInterface
             set => pageText.Colour = value;
         }
 
+        protected virtual Drawable CreateIcon() => iconSprite = new SpriteIcon
+        {
+            Size = new Vector2(ICON_SIZE),
+        };
+
         protected ScreenTitle()
         {
             AutoSizeAxes = Axes.Both;
@@ -48,12 +64,9 @@ namespace osu.Game.Graphics.UserInterface
                 {
                     AutoSizeAxes = Axes.Both,
                     Spacing = new Vector2(icon_spacing, 0),
-                    Children = new Drawable[]
+                    Children = new[]
                     {
-                        iconSprite = new SpriteIcon
-                        {
-                            Size = new Vector2(icon_size),
-                        },
+                        CreateIcon(),
                         new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.Both,