From 3a3df06e0b2e0a38ab2c1591d012a78859b164cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Mar 2020 13:11:40 +0900
Subject: [PATCH] Fix some pieces of SettingsItem getting dimmed twice when
 disabled

---
 .../Overlays/Settings/SettingsCheckbox.cs     |  6 ++----
 osu.Game/Overlays/Settings/SettingsItem.cs    | 20 +++++++++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Settings/SettingsCheckbox.cs b/osu.Game/Overlays/Settings/SettingsCheckbox.cs
index a554159fd7..437b2e45b3 100644
--- a/osu.Game/Overlays/Settings/SettingsCheckbox.cs
+++ b/osu.Game/Overlays/Settings/SettingsCheckbox.cs
@@ -8,16 +8,14 @@ namespace osu.Game.Overlays.Settings
 {
     public class SettingsCheckbox : SettingsItem<bool>
     {
-        private OsuCheckbox checkbox;
-
         private string labelText;
 
-        protected override Drawable CreateControl() => checkbox = new OsuCheckbox();
+        protected override Drawable CreateControl() => new OsuCheckbox();
 
         public override string LabelText
         {
             get => labelText;
-            set => checkbox.LabelText = labelText = value;
+            set => ((OsuCheckbox)Control).LabelText = labelText = value;
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index e89f2adf0b..c2dd40d2a6 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -33,22 +33,24 @@ namespace osu.Game.Overlays.Settings
 
         protected readonly FillFlowContainer FlowContent;
 
-        private SpriteText text;
+        private SpriteText labelText;
 
         public bool ShowsDefaultIndicator = true;
 
         public virtual string LabelText
         {
-            get => text?.Text ?? string.Empty;
+            get => labelText?.Text ?? string.Empty;
             set
             {
-                if (text == null)
+                if (labelText == null)
                 {
                     // construct lazily for cases where the label is not needed (may be provided by the Control).
-                    FlowContent.Insert(-1, text = new OsuSpriteText());
+                    FlowContent.Insert(-1, labelText = new OsuSpriteText());
+
+                    updateDisabled();
                 }
 
-                text.Text = value;
+                labelText.Text = value;
             }
         }
 
@@ -96,13 +98,19 @@ namespace osu.Game.Overlays.Settings
             if (controlWithCurrent != null)
             {
                 controlWithCurrent.Current.ValueChanged += _ => SettingChanged?.Invoke();
-                controlWithCurrent.Current.DisabledChanged += disabled => { Colour = disabled ? Color4.Gray : Color4.White; };
+                controlWithCurrent.Current.DisabledChanged += _ => updateDisabled();
 
                 if (ShowsDefaultIndicator)
                     restoreDefaultButton.Bindable = controlWithCurrent.Current;
             }
         }
 
+        private void updateDisabled()
+        {
+            if (labelText != null)
+                labelText.Alpha = controlWithCurrent.Current.Disabled ? 0.3f : 1;
+        }
+
         private class RestoreDefaultValueButton : Container, IHasTooltip
         {
             private Bindable<T> bindable;