From 88b9942b2ac601d33c40a41f8d3625b7788eabf5 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Thu, 8 Aug 2019 17:07:06 +0300
Subject: [PATCH] Move EnableUserDim check to defualt value of ShowDimContent

---
 osu.Game/Graphics/Containers/UserDimContainer.cs | 2 +-
 osu.Game/Screens/Play/DimmableStoryboard.cs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index dd5134168f..b7da5592a8 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Graphics.Containers
         /// <summary>
         /// Whether the content of this container should currently be visible.
         /// </summary>
-        protected virtual bool ShowDimContent => true;
+        protected virtual bool ShowDimContent => !EnableUserDim.Value;
 
         /// <summary>
         /// Should be invoked when any dependent dim level or user setting is changed and bring the visual state up-to-date.
diff --git a/osu.Game/Screens/Play/DimmableStoryboard.cs b/osu.Game/Screens/Play/DimmableStoryboard.cs
index 45dff039b6..10ddaeb354 100644
--- a/osu.Game/Screens/Play/DimmableStoryboard.cs
+++ b/osu.Game/Screens/Play/DimmableStoryboard.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Play
             base.LoadComplete();
         }
 
-        protected override bool ShowDimContent => ShowStoryboard.Value && UserDimLevel.Value < 1;
+        protected override bool ShowDimContent => base.ShowDimContent || ShowStoryboard.Value && UserDimLevel.Value < 1;
 
         private void initializeStoryboard(bool async)
         {