From 1d34124667666f291957df354b362873c534fce1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 25 Aug 2019 11:56:07 +0900
Subject: [PATCH] Revert all DifficultyIcon changes

---
 osu.Game/Beatmaps/Drawables/DifficultyIcon.cs | 91 ++++++++-----------
 1 file changed, 36 insertions(+), 55 deletions(-)

diff --git a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
index 7732aa96f8..81f517dd86 100644
--- a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
+++ b/osu.Game/Beatmaps/Drawables/DifficultyIcon.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.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -20,22 +21,10 @@ namespace osu.Game.Beatmaps.Drawables
 {
     public class DifficultyIcon : CompositeDrawable, IHasCustomTooltip
     {
-        private BeatmapInfo beatmap;
+        private readonly BeatmapInfo beatmap;
+        private readonly RulesetInfo ruleset;
 
         private readonly Container iconContainer;
-        private readonly Box iconBg;
-
-        protected BeatmapInfo Beatmap
-        {
-            get => beatmap;
-            set
-            {
-                beatmap = value;
-
-                if (IsLoaded)
-                    updateIconColour();
-            }
-        }
 
         /// <summary>
         /// Size of this difficulty icon.
@@ -48,46 +37,15 @@ protected BeatmapInfo Beatmap
 
         public DifficultyIcon(BeatmapInfo beatmap, RulesetInfo ruleset = null, bool shouldShowTooltip = true)
         {
-            this.beatmap = beatmap;
+            this.beatmap = beatmap ?? throw new ArgumentNullException(nameof(beatmap));
 
+            this.ruleset = ruleset ?? beatmap.Ruleset;
             if (shouldShowTooltip)
                 TooltipContent = beatmap;
 
             AutoSizeAxes = Axes.Both;
 
-            InternalChild = iconContainer = new Container
-            {
-                Size = new Vector2(20f),
-                Children = new Drawable[]
-                {
-                    new CircularContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Scale = new Vector2(0.84f),
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Masking = true,
-                        EdgeEffect = new EdgeEffectParameters
-                        {
-                            Colour = Color4.Black.Opacity(0.08f),
-                            Type = EdgeEffectType.Shadow,
-                            Radius = 5,
-                        },
-                        Child = iconBg = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                    },
-                    new ConstrainedIconContainer
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Both,
-                        // the null coalesce here is only present to make unit tests work (ruleset dlls aren't copied correctly for testing at the moment)
-                        Icon = (ruleset ?? beatmap?.Ruleset)?.CreateInstance().CreateIcon() ?? new SpriteIcon { Icon = FontAwesome.Regular.QuestionCircle }
-                    }
-                }
-            };
+            InternalChild = iconContainer = new Container { Size = new Vector2(20f) };
         }
 
         public string TooltipText { get; set; }
@@ -96,18 +54,41 @@ public DifficultyIcon(BeatmapInfo beatmap, RulesetInfo ruleset = null, bool shou
 
         public object TooltipContent { get; set; }
 
-        private OsuColour colours;
-
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            this.colours = colours;
-
-            updateIconColour();
+            iconContainer.Children = new Drawable[]
+            {
+                new CircularContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Scale = new Vector2(0.84f),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Masking = true,
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Colour = Color4.Black.Opacity(0.08f),
+                        Type = EdgeEffectType.Shadow,
+                        Radius = 5,
+                    },
+                    Child = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colours.ForDifficultyRating(beatmap.DifficultyRating),
+                    },
+                },
+                new ConstrainedIconContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    // the null coalesce here is only present to make unit tests work (ruleset dlls aren't copied correctly for testing at the moment)
+                    Icon = ruleset?.CreateInstance().CreateIcon() ?? new SpriteIcon { Icon = FontAwesome.Regular.QuestionCircle }
+                }
+            };
         }
 
-        private void updateIconColour() => iconBg.Colour = colours.ForDifficultyRating(beatmap.DifficultyRating);
-
         private class DifficultyIconTooltip : VisibilityContainer, ITooltip
         {
             private readonly OsuSpriteText difficultyName, starRating;