rename back to UserDimContainer

osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs

@@ -43,7 +43,7 @@ namespace osu.Game.Tests.Visual
             typeof(ScreenWithBeatmapBackground),
             typeof(PlayerLoader),
             typeof(Player),
-            typeof(VisualSettingsContainer),
+            typeof(UserDimContainer),
             typeof(OsuScreen)
         };
 
@@ -165,7 +165,7 @@ namespace osu.Game.Tests.Visual
         }
 
         /// <summary>
-        /// Check if the <see cref="VisualSettingsContainer"/> is properly accepting user-defined visual changes at all.
+        /// Check if the <see cref="UserDimContainer"/> is properly accepting user-defined visual changes at all.
         /// </summary>
         [Test]
         public void DisableUserDimTest()
@@ -327,9 +327,9 @@ namespace osu.Game.Tests.Visual
         {
             protected override BackgroundScreen CreateBackground() => new FadeAccessibleBackground(Beatmap.Value);
 
-            protected override VisualSettingsContainer CreateStoryboardContainer()
+            protected override UserDimContainer CreateStoryboardContainer()
             {
-                return new TestVisualSettingsContainer(true)
+                return new TestUserDimContainer(true)
                 {
                     RelativeSizeAxes = Axes.Both,
                     Alpha = 1,
@@ -339,7 +339,7 @@ namespace osu.Game.Tests.Visual
 
             public PausableGameplayContainer CurrentPausableGameplayContainer => PausableGameplayContainer;
 
-            public VisualSettingsContainer CurrentStoryboardContainer => StoryboardContainer;
+            public UserDimContainer CurrentStoryboardContainer => StoryboardContainer;
 
             // Whether or not the player should be allowed to load.
             public bool Ready;
@@ -348,9 +348,9 @@ namespace osu.Game.Tests.Visual
             public readonly Bindable<bool> ReplacesBackground = new Bindable<bool>();
             public readonly Bindable<bool> IsPaused = new Bindable<bool>();
 
-            public bool IsStoryboardVisible() => ((TestVisualSettingsContainer)CurrentStoryboardContainer).CurrentAlpha == 1;
+            public bool IsStoryboardVisible() => ((TestUserDimContainer)CurrentStoryboardContainer).CurrentAlpha == 1;
 
-            public bool IsStoryboardInvisible() => ((TestVisualSettingsContainer)CurrentStoryboardContainer).CurrentAlpha <= 1;
+            public bool IsStoryboardInvisible() => ((TestUserDimContainer)CurrentStoryboardContainer).CurrentAlpha <= 1;
 
             [BackgroundDependencyLoader]
             private void load(OsuConfigManager config)
@@ -396,7 +396,7 @@ namespace osu.Game.Tests.Visual
 
         private class FadeAccessibleBackground : BackgroundScreenBeatmap
         {
-            protected override VisualSettingsContainer CreateFadeContainer() => fadeContainer = new TestVisualSettingsContainer { RelativeSizeAxes = Axes.Both };
+            protected override UserDimContainer CreateFadeContainer() => fadeContainer = new TestUserDimContainer { RelativeSizeAxes = Axes.Both };
 
             public Color4 CurrentColour => fadeContainer.CurrentColour;
 
@@ -404,7 +404,7 @@ namespace osu.Game.Tests.Visual
 
             public Vector2 CurrentBlur => Background.BlurSigma;
 
-            private TestVisualSettingsContainer fadeContainer;
+            private TestUserDimContainer fadeContainer;
 
             public FadeAccessibleBackground(WorkingBeatmap beatmap)
                 : base(beatmap)
@@ -412,12 +412,12 @@ namespace osu.Game.Tests.Visual
             }
         }
 
-        private class TestVisualSettingsContainer : VisualSettingsContainer
+        private class TestUserDimContainer : UserDimContainer
         {
-            public Color4 CurrentColour => LocalContainer.Colour;
+            public Color4 CurrentColour => DimContainer.Colour;
-            public float CurrentAlpha => LocalContainer.Alpha;
+            public float CurrentAlpha => DimContainer.Alpha;
 
-            public TestVisualSettingsContainer(bool isStoryboard = false)
+            public TestUserDimContainer(bool isStoryboard = false)
                 : base(isStoryboard)
             {
             }

osu.Game/Graphics/Containers/UserDimContainer.cs

@@ -16,7 +16,7 @@ namespace osu.Game.Graphics.Containers
     /// A container that applies user-configured visual settings to its contents.
     /// This container specifies behavior that applies to both Storyboards and Backgrounds.
     /// </summary>
-    public class VisualSettingsContainer : Container
+    public class UserDimContainer : Container
     {
         private const float background_fade_duration = 800;
 
@@ -36,9 +36,9 @@ namespace osu.Game.Graphics.Containers
         /// </summary>
         public readonly Bindable<bool> StoryboardReplacesBackground = new Bindable<bool>();
 
-        protected Container LocalContainer { get; }
+        protected Container DimContainer { get; }
 
-        protected override Container<Drawable> Content => LocalContainer;
+        protected override Container<Drawable> Content => DimContainer;
 
         private readonly bool isStoryboard;
 
@@ -49,7 +49,7 @@ namespace osu.Game.Graphics.Containers
             : new Vector2(AddedBlur.Value);
 
         /// <summary>
-        /// Creates a new <see cref="VisualSettingsContainer"/>.
+        /// Creates a new <see cref="UserDimContainer"/>.
         /// </summary>
         /// <param name="isStoryboard"> Whether or not this instance contains a storyboard.
         /// <remarks>
@@ -57,10 +57,10 @@ namespace osu.Game.Graphics.Containers
         /// and can cause backgrounds to become hidden via <see cref="StoryboardReplacesBackground"/>. Storyboards are also currently unable to be blurred.
         /// </remarks>
         /// </param>
-        public VisualSettingsContainer(bool isStoryboard = false)
+        public UserDimContainer(bool isStoryboard = false)
         {
             this.isStoryboard = isStoryboard;
-            AddInternal(LocalContainer = new Container { RelativeSizeAxes = Axes.Both });
+            AddInternal(DimContainer = new Container { RelativeSizeAxes = Axes.Both });
         }
 
         [BackgroundDependencyLoader]
@@ -87,14 +87,14 @@ namespace osu.Game.Graphics.Containers
         {
             if (isStoryboard)
             {
-                LocalContainer.FadeTo(!showStoryboard.Value || dimLevel.Value == 1 ? 0 : 1, background_fade_duration, Easing.OutQuint);
+                DimContainer.FadeTo(!showStoryboard.Value || dimLevel.Value == 1 ? 0 : 1, background_fade_duration, Easing.OutQuint);
             }
             else
             {
                 // The background needs to be hidden in the case of it being replaced by the storyboard
-                LocalContainer.FadeTo(showStoryboard.Value && StoryboardReplacesBackground.Value ? 0 : 1, background_fade_duration, Easing.OutQuint);
+                DimContainer.FadeTo(showStoryboard.Value && StoryboardReplacesBackground.Value ? 0 : 1, background_fade_duration, Easing.OutQuint);
 
-                foreach (Drawable c in LocalContainer)
+                foreach (Drawable c in DimContainer)
                 {
                     // Only blur if this container contains a background
                     // We can't blur the container like we did with the dim because buffered containers add considerable draw overhead.
@@ -103,7 +103,7 @@ namespace osu.Game.Graphics.Containers
                 }
             }
 
-            LocalContainer.FadeColour(EnableVisualSettings.Value ? OsuColour.Gray(1 - (float)dimLevel.Value) : Color4.White, background_fade_duration, Easing.OutQuint);
+            DimContainer.FadeColour(EnableVisualSettings.Value ? OsuColour.Gray(1 - (float)dimLevel.Value) : Color4.White, background_fade_duration, Easing.OutQuint);
         }
     }
 }

osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs

@@ -24,9 +24,9 @@ namespace osu.Game.Screens.Backgrounds
 
         public readonly Bindable<float> AddedBlur = new Bindable<float>();
 
-        private readonly VisualSettingsContainer fadeContainer;
+        private readonly UserDimContainer fadeContainer;
 
-        protected virtual VisualSettingsContainer CreateFadeContainer() => new VisualSettingsContainer { RelativeSizeAxes = Axes.Both };
+        protected virtual UserDimContainer CreateFadeContainer() => new UserDimContainer { RelativeSizeAxes = Axes.Both };
 
         public virtual WorkingBeatmap Beatmap
         {

osu.Game/Screens/Play/Player.cs

@@ -71,9 +71,9 @@ namespace osu.Game.Screens.Play
         private FailOverlay failOverlay;
 
         private DrawableStoryboard storyboard;
-        protected VisualSettingsContainer StoryboardContainer { get; private set; }
+        protected UserDimContainer StoryboardContainer { get; private set; }
 
-        protected virtual VisualSettingsContainer CreateStoryboardContainer() => new VisualSettingsContainer(true)
+        protected virtual UserDimContainer CreateStoryboardContainer() => new UserDimContainer(true)
         {
             RelativeSizeAxes = Axes.Both,
             Alpha = 1,