From de881cc5cb44829ce9fdc1f468f28000869081bd Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 24 Oct 2022 23:17:28 +0900
Subject: [PATCH 01/13] useless #nullable disable

---
 osu.Game/Screens/Edit/Components/Menus/DifficultyMenuItem.cs   | 2 --
 osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs        | 2 --
 osu.Game/Screens/Edit/Components/Menus/EditorMenuItem.cs       | 2 --
 osu.Game/Screens/Edit/Components/Menus/EditorMenuItemSpacer.cs | 2 --
 4 files changed, 8 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Menus/DifficultyMenuItem.cs b/osu.Game/Screens/Edit/Components/Menus/DifficultyMenuItem.cs
index e14354222b..6af3ba908d 100644
--- a/osu.Game/Screens/Edit/Components/Menus/DifficultyMenuItem.cs
+++ b/osu.Game/Screens/Edit/Components/Menus/DifficultyMenuItem.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
diff --git a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
index 8321fde171..20b8bba6da 100644
--- a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
+++ b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
diff --git a/osu.Game/Screens/Edit/Components/Menus/EditorMenuItem.cs b/osu.Game/Screens/Edit/Components/Menus/EditorMenuItem.cs
index 1085f2c277..0a2c073dcd 100644
--- a/osu.Game/Screens/Edit/Components/Menus/EditorMenuItem.cs
+++ b/osu.Game/Screens/Edit/Components/Menus/EditorMenuItem.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using osu.Game.Graphics.UserInterface;
 
diff --git a/osu.Game/Screens/Edit/Components/Menus/EditorMenuItemSpacer.cs b/osu.Game/Screens/Edit/Components/Menus/EditorMenuItemSpacer.cs
index 6af3b99017..4e75a92e19 100644
--- a/osu.Game/Screens/Edit/Components/Menus/EditorMenuItemSpacer.cs
+++ b/osu.Game/Screens/Edit/Components/Menus/EditorMenuItemSpacer.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 namespace osu.Game.Screens.Edit.Components.Menus
 {
     public class EditorMenuItemSpacer : EditorMenuItem

From a2682b3ce39ddf9fc3e6c311206520c4e4d8472b Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Mon, 24 Oct 2022 23:18:34 +0900
Subject: [PATCH 02/13] background dim settings for editor

View -> Background Dim

follow `DimLevel` and `BlurLevel`

Co-Authored-By: Dead_Bush_Sanpai <DeadBushSanpai@yandex.com>
---
 osu.Game/Configuration/OsuConfigManager.cs |  2 ++
 osu.Game/Screens/Edit/Editor.cs            | 23 +++++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 1378e1691a..f8c851757e 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -122,6 +122,7 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.PositionalHitsoundsLevel, 0.2f, 0, 1);
             SetDefault(OsuSetting.DimLevel, 0.7, 0, 1, 0.01);
             SetDefault(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
+            SetDefault(OsuSetting.EditorUseDim, false);
             SetDefault(OsuSetting.LightenDuringBreaks, true);
 
             SetDefault(OsuSetting.HitLighting, true);
@@ -292,6 +293,7 @@ namespace osu.Game.Configuration
         GameplayCursorDuringTouch,
         DimLevel,
         BlurLevel,
+        EditorUseDim,
         LightenDuringBreaks,
         ShowStoryboard,
         KeyOverlay,
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 3dfc7010f3..9cfd1badd1 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -176,6 +176,8 @@ namespace osu.Game.Screens.Edit
         [Resolved(canBeNull: true)]
         private OnScreenDisplay onScreenDisplay { get; set; }
 
+        private Bindable<bool> useUserDim;
+
         public Editor(EditorLoader loader = null)
         {
             this.loader = loader;
@@ -260,6 +262,9 @@ namespace osu.Game.Screens.Edit
             OsuMenuItem undoMenuItem;
             OsuMenuItem redoMenuItem;
 
+            TernaryStateRadioMenuItem backgroundDim;
+            useUserDim = config.GetBindable<bool>(OsuSetting.EditorUseDim);
+
             AddInternal(new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -311,6 +316,7 @@ namespace osu.Game.Screens.Edit
                                         Items = new MenuItem[]
                                         {
                                             new WaveformOpacityMenuItem(config.GetBindable<float>(OsuSetting.EditorWaveformOpacity)),
+                                            backgroundDim = new TernaryStateRadioMenuItem("Background Dim", MenuItemType.Standard, _ => useUserDim.Value = !useUserDim.Value),
                                         }
                                     }
                                 }
@@ -330,6 +336,13 @@ namespace osu.Game.Screens.Edit
 
             changeHandler?.CanUndo.BindValueChanged(v => undoMenuItem.Action.Disabled = !v.NewValue, true);
             changeHandler?.CanRedo.BindValueChanged(v => redoMenuItem.Action.Disabled = !v.NewValue, true);
+
+            useUserDim.BindValueChanged(s =>
+            {
+                dimBackground();
+                backgroundDim.State.Value = s.NewValue ? TernaryState.True : TernaryState.False;
+            });
+            backgroundDim.State.Value = useUserDim.Value ? TernaryState.True : TernaryState.False;
         }
 
         [Resolved]
@@ -626,9 +639,9 @@ namespace osu.Game.Screens.Edit
             ApplyToBackground(b =>
             {
                 // todo: temporary. we want to be applying dim using the UserDimContainer eventually.
-                b.FadeColour(Color4.DarkGray, 500);
+                if (!useUserDim.Value) b.FadeColour(Color4.DarkGray, 500);
 
-                b.IgnoreUserSettings.Value = true;
+                b.IgnoreUserSettings.Value = !useUserDim.Value;
                 b.BlurAmount.Value = 0;
             });
         }
@@ -656,7 +669,11 @@ namespace osu.Game.Screens.Edit
                 }
             }
 
-            ApplyToBackground(b => b.FadeColour(Color4.White, 500));
+            ApplyToBackground(b =>
+            {
+                b.FadeColour(Color4.White, 500);
+                b.IgnoreUserSettings.Value = true;
+            });
             resetTrack();
 
             refetchBeatmap();

From f9c61904262f30b9f6297bcee9737cc13c691021 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 25 Oct 2022 13:00:53 +0900
Subject: [PATCH 03/13] Add DimAmount for UserDimContainer

---
 osu.Game/Graphics/Containers/UserDimContainer.cs        | 5 ++++-
 osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index d52fb7c60a..296855522b 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -48,13 +48,15 @@ namespace osu.Game.Graphics.Containers
 
         protected Bindable<double> UserDimLevel { get; private set; }
 
+        public Bindable<float> DimAmount { get; set; } = new Bindable<float>();
+
         protected Bindable<bool> LightenDuringBreaks { get; private set; }
 
         protected Bindable<bool> ShowStoryboard { get; private set; }
 
         private float breakLightening => LightenDuringBreaks.Value && IsBreakTime.Value ? BREAK_LIGHTEN_AMOUNT : 0;
 
-        protected float DimLevel => Math.Max(!IgnoreUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : 0, 0);
+        protected float DimLevel => Math.Max(!IgnoreUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : DimAmount.Value, 0);
 
         protected override Container<Drawable> Content => dimContent;
 
@@ -76,6 +78,7 @@ namespace osu.Game.Graphics.Containers
             ShowStoryboard = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
 
             UserDimLevel.ValueChanged += _ => UpdateVisuals();
+            DimAmount.ValueChanged += _ => UpdateVisuals();
             LightenDuringBreaks.ValueChanged += _ => UpdateVisuals();
             IsBreakTime.ValueChanged += _ => UpdateVisuals();
             ShowStoryboard.ValueChanged += _ => UpdateVisuals();
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index ca05c8af46..053bcf2387 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -43,6 +43,8 @@ namespace osu.Game.Screens.Backgrounds
         /// </summary>
         public readonly Bindable<float> BlurAmount = new BindableFloat();
 
+        public readonly Bindable<float> DimAmount = new Bindable<float>();
+
         internal readonly IBindable<bool> IsBreakTime = new Bindable<bool>();
 
         private readonly DimmableBackground dimmable;
@@ -58,6 +60,7 @@ namespace osu.Game.Screens.Backgrounds
             dimmable.IgnoreUserSettings.BindTo(IgnoreUserSettings);
             dimmable.IsBreakTime.BindTo(IsBreakTime);
             dimmable.BlurAmount.BindTo(BlurAmount);
+            dimmable.DimAmount.BindTo(DimAmount);
 
             StoryboardReplacesBackground.BindTo(dimmable.StoryboardReplacesBackground);
         }

From 6991195d69b6a444ec4aad8b5e915fc105ce6d99 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Tue, 25 Oct 2022 13:01:24 +0900
Subject: [PATCH 04/13] let editor dim different from gameplay dim

---
 .../Editing/TestSceneEditorTestGameplay.cs    | 15 ++++--
 osu.Game/Configuration/OsuConfigManager.cs    |  4 +-
 .../Screens/Edit/BackgroundDimMenuItem.cs     | 46 +++++++++++++++++++
 osu.Game/Screens/Edit/Editor.cs               | 25 ++++------
 4 files changed, 68 insertions(+), 22 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/BackgroundDimMenuItem.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
index a5d115331d..9722c60cba 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
@@ -7,10 +7,12 @@ using System;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
@@ -21,7 +23,6 @@ using osu.Game.Screens.Edit.GameplayTest;
 using osu.Game.Screens.Play;
 using osu.Game.Storyboards;
 using osu.Game.Tests.Beatmaps.IO;
-using osuTK.Graphics;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Editing
@@ -40,6 +41,14 @@ namespace osu.Game.Tests.Visual.Editing
 
         private BeatmapSetInfo importedBeatmapSet;
 
+        private Bindable<float> editorDim;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            editorDim = config.GetBindable<float>(OsuSetting.EditorDim);
+        }
+
         public override void SetUpSteps()
         {
             AddStep("import test beatmap", () => importedBeatmapSet = BeatmapImportHelper.LoadOszIntoOsu(game).GetResultSafely());
@@ -77,7 +86,7 @@ namespace osu.Game.Tests.Visual.Editing
                 // this test cares about checking the background belonging to the editor specifically, so check that using reference equality
                 // (as `.Equals()` cannot discern between the two, as they technically share the same database GUID).
                 var background = this.ChildrenOfType<BackgroundScreenBeatmap>().Single(b => ReferenceEquals(b.Beatmap.BeatmapInfo, EditorBeatmap.BeatmapInfo));
-                return background.Colour == Color4.DarkGray && background.BlurAmount.Value == 0;
+                return background.DimAmount.Value == editorDim.Value && background.BlurAmount.Value == 0;
             });
             AddAssert("no mods selected", () => SelectedMods.Value.Count == 0);
         }
@@ -110,7 +119,7 @@ namespace osu.Game.Tests.Visual.Editing
                 // this test cares about checking the background belonging to the editor specifically, so check that using reference equality
                 // (as `.Equals()` cannot discern between the two, as they technically share the same database GUID).
                 var background = this.ChildrenOfType<BackgroundScreenBeatmap>().Single(b => ReferenceEquals(b.Beatmap.BeatmapInfo, EditorBeatmap.BeatmapInfo));
-                return background.Colour == Color4.DarkGray && background.BlurAmount.Value == 0;
+                return background.DimAmount.Value == editorDim.Value && background.BlurAmount.Value == 0;
             });
 
             AddStep("start track", () => EditorClock.Start());
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index f8c851757e..30299eb062 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.PositionalHitsoundsLevel, 0.2f, 0, 1);
             SetDefault(OsuSetting.DimLevel, 0.7, 0, 1, 0.01);
             SetDefault(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
-            SetDefault(OsuSetting.EditorUseDim, false);
+            SetDefault(OsuSetting.EditorDim, 0.25f);
             SetDefault(OsuSetting.LightenDuringBreaks, true);
 
             SetDefault(OsuSetting.HitLighting, true);
@@ -293,7 +293,7 @@ namespace osu.Game.Configuration
         GameplayCursorDuringTouch,
         DimLevel,
         BlurLevel,
-        EditorUseDim,
+        EditorDim,
         LightenDuringBreaks,
         ShowStoryboard,
         KeyOverlay,
diff --git a/osu.Game/Screens/Edit/BackgroundDimMenuItem.cs b/osu.Game/Screens/Edit/BackgroundDimMenuItem.cs
new file mode 100644
index 0000000000..b8644ed690
--- /dev/null
+++ b/osu.Game/Screens/Edit/BackgroundDimMenuItem.cs
@@ -0,0 +1,46 @@
+// 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.Collections.Generic;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Screens.Edit
+{
+    internal class BackgroundDimMenuItem : MenuItem
+    {
+        private readonly Bindable<float> backgroudDim;
+
+        private readonly Dictionary<float, TernaryStateRadioMenuItem> menuItemLookup = new Dictionary<float, TernaryStateRadioMenuItem>();
+
+        public BackgroundDimMenuItem(Bindable<float> backgroudDim)
+            : base("Background dim")
+        {
+            Items = new[]
+            {
+                createMenuItem(0f),
+                createMenuItem(0.25f),
+                createMenuItem(0.5f),
+                createMenuItem(0.75f),
+                createMenuItem(1f),
+            };
+
+            this.backgroudDim = backgroudDim;
+            backgroudDim.BindValueChanged(dim =>
+            {
+                foreach (var kvp in menuItemLookup)
+                    kvp.Value.State.Value = kvp.Key == dim.NewValue ? TernaryState.True : TernaryState.False;
+            }, true);
+        }
+
+        private TernaryStateRadioMenuItem createMenuItem(float dim)
+        {
+            var item = new TernaryStateRadioMenuItem($"{dim * 100}%", MenuItemType.Standard, _ => updateOpacity(dim));
+            menuItemLookup[dim] = item;
+            return item;
+        }
+
+        private void updateOpacity(float dim) => backgroudDim.Value = dim;
+    }
+}
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 9cfd1badd1..3c91d302ae 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -51,7 +51,6 @@ using osu.Game.Screens.Edit.Timing;
 using osu.Game.Screens.Edit.Verify;
 using osu.Game.Screens.Play;
 using osu.Game.Users;
-using osuTK.Graphics;
 using osuTK.Input;
 using CommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings;
 
@@ -176,7 +175,7 @@ namespace osu.Game.Screens.Edit
         [Resolved(canBeNull: true)]
         private OnScreenDisplay onScreenDisplay { get; set; }
 
-        private Bindable<bool> useUserDim;
+        private Bindable<float> editorDim;
 
         public Editor(EditorLoader loader = null)
         {
@@ -262,8 +261,7 @@ namespace osu.Game.Screens.Edit
             OsuMenuItem undoMenuItem;
             OsuMenuItem redoMenuItem;
 
-            TernaryStateRadioMenuItem backgroundDim;
-            useUserDim = config.GetBindable<bool>(OsuSetting.EditorUseDim);
+            editorDim = config.GetBindable<float>(OsuSetting.EditorDim);
 
             AddInternal(new OsuContextMenuContainer
             {
@@ -316,7 +314,7 @@ namespace osu.Game.Screens.Edit
                                         Items = new MenuItem[]
                                         {
                                             new WaveformOpacityMenuItem(config.GetBindable<float>(OsuSetting.EditorWaveformOpacity)),
-                                            backgroundDim = new TernaryStateRadioMenuItem("Background Dim", MenuItemType.Standard, _ => useUserDim.Value = !useUserDim.Value),
+                                            new BackgroundDimMenuItem(editorDim),
                                         }
                                     }
                                 }
@@ -337,12 +335,7 @@ namespace osu.Game.Screens.Edit
             changeHandler?.CanUndo.BindValueChanged(v => undoMenuItem.Action.Disabled = !v.NewValue, true);
             changeHandler?.CanRedo.BindValueChanged(v => redoMenuItem.Action.Disabled = !v.NewValue, true);
 
-            useUserDim.BindValueChanged(s =>
-            {
-                dimBackground();
-                backgroundDim.State.Value = s.NewValue ? TernaryState.True : TernaryState.False;
-            });
-            backgroundDim.State.Value = useUserDim.Value ? TernaryState.True : TernaryState.False;
+            editorDim.BindValueChanged(_ => dimBackground());
         }
 
         [Resolved]
@@ -638,10 +631,8 @@ namespace osu.Game.Screens.Edit
         {
             ApplyToBackground(b =>
             {
-                // todo: temporary. we want to be applying dim using the UserDimContainer eventually.
-                if (!useUserDim.Value) b.FadeColour(Color4.DarkGray, 500);
-
-                b.IgnoreUserSettings.Value = !useUserDim.Value;
+                b.IgnoreUserSettings.Value = true;
+                b.DimAmount.Value = editorDim.Value;
                 b.BlurAmount.Value = 0;
             });
         }
@@ -671,8 +662,8 @@ namespace osu.Game.Screens.Edit
 
             ApplyToBackground(b =>
             {
-                b.FadeColour(Color4.White, 500);
-                b.IgnoreUserSettings.Value = true;
+                //b.DimAmount.UnbindAll();
+                b.DimAmount.Value = 0;
             });
             resetTrack();
 

From df1f7e2b13192efc811594d8bbfbf6b2eaab607f Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 2 Nov 2022 15:09:40 +0900
Subject: [PATCH 05/13] remove `#nullable disable`

---
 osu.Game/Graphics/Containers/UserDimContainer.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index 296855522b..a6a8f341b6 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -46,13 +44,13 @@ namespace osu.Game.Graphics.Containers
         /// </summary>
         public bool ContentDisplayed { get; private set; }
 
-        protected Bindable<double> UserDimLevel { get; private set; }
+        protected Bindable<double> UserDimLevel { get; private set; } = null!;
 
         public Bindable<float> DimAmount { get; set; } = new Bindable<float>();
 
-        protected Bindable<bool> LightenDuringBreaks { get; private set; }
+        protected Bindable<bool> LightenDuringBreaks { get; private set; } = null!;
 
-        protected Bindable<bool> ShowStoryboard { get; private set; }
+        protected Bindable<bool> ShowStoryboard { get; private set; } = null!;
 
         private float breakLightening => LightenDuringBreaks.Value && IsBreakTime.Value ? BREAK_LIGHTEN_AMOUNT : 0;
 

From d6b8439121ce20ec11c8ad2bfae9892394ba9523 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 2 Nov 2022 15:11:49 +0900
Subject: [PATCH 06/13] add xmldoc for DimAmount

---
 osu.Game/Graphics/Containers/UserDimContainer.cs        | 3 +++
 osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index a6a8f341b6..62dd4e19b0 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -46,6 +46,9 @@ namespace osu.Game.Graphics.Containers
 
         protected Bindable<double> UserDimLevel { get; private set; } = null!;
 
+        /// <summary>
+        /// The amount of dim to be override if <see cref="IgnoreUserSettings"/> is true.
+        /// </summary>
         public Bindable<float> DimAmount { get; set; } = new Bindable<float>();
 
         protected Bindable<bool> LightenDuringBreaks { get; private set; } = null!;
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 053bcf2387..9f3e99d793 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -43,6 +43,9 @@ namespace osu.Game.Screens.Backgrounds
         /// </summary>
         public readonly Bindable<float> BlurAmount = new BindableFloat();
 
+        /// <summary>
+        /// The amount of dim to be override if <see cref="IgnoreUserSettings"/> is true.
+        /// </summary>
         public readonly Bindable<float> DimAmount = new Bindable<float>();
 
         internal readonly IBindable<bool> IsBreakTime = new Bindable<bool>();

From 98846182909f5be197ce44c413ccdc05cfa79e48 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 2 Nov 2022 15:12:15 +0900
Subject: [PATCH 07/13] rename `editorDim` to `editorBackgroundDim`

---
 osu.Game/Screens/Edit/Editor.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 3c91d302ae..04fa96171d 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -175,7 +175,7 @@ namespace osu.Game.Screens.Edit
         [Resolved(canBeNull: true)]
         private OnScreenDisplay onScreenDisplay { get; set; }
 
-        private Bindable<float> editorDim;
+        private Bindable<float> editorBackgroundDim;
 
         public Editor(EditorLoader loader = null)
         {
@@ -261,7 +261,7 @@ namespace osu.Game.Screens.Edit
             OsuMenuItem undoMenuItem;
             OsuMenuItem redoMenuItem;
 
-            editorDim = config.GetBindable<float>(OsuSetting.EditorDim);
+            editorBackgroundDim = config.GetBindable<float>(OsuSetting.EditorDim);
 
             AddInternal(new OsuContextMenuContainer
             {
@@ -314,7 +314,7 @@ namespace osu.Game.Screens.Edit
                                         Items = new MenuItem[]
                                         {
                                             new WaveformOpacityMenuItem(config.GetBindable<float>(OsuSetting.EditorWaveformOpacity)),
-                                            new BackgroundDimMenuItem(editorDim),
+                                            new BackgroundDimMenuItem(editorBackgroundDim),
                                         }
                                     }
                                 }
@@ -335,7 +335,7 @@ namespace osu.Game.Screens.Edit
             changeHandler?.CanUndo.BindValueChanged(v => undoMenuItem.Action.Disabled = !v.NewValue, true);
             changeHandler?.CanRedo.BindValueChanged(v => redoMenuItem.Action.Disabled = !v.NewValue, true);
 
-            editorDim.BindValueChanged(_ => dimBackground());
+            editorBackgroundDim.BindValueChanged(_ => dimBackground());
         }
 
         [Resolved]
@@ -632,7 +632,7 @@ namespace osu.Game.Screens.Edit
             ApplyToBackground(b =>
             {
                 b.IgnoreUserSettings.Value = true;
-                b.DimAmount.Value = editorDim.Value;
+                b.DimAmount.Value = editorBackgroundDim.Value;
                 b.BlurAmount.Value = 0;
             });
         }

From 0e502de8b473d9dda312bd4ddb590c7ce8dde1a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Nov 2022 17:49:52 +0900
Subject: [PATCH 08/13] Rename field to match usage

---
 .../Visual/Editing/TestSceneEditorTestGameplay.cs         | 4 ++--
 osu.Game/Graphics/Containers/UserDimContainer.cs          | 8 ++++----
 osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs   | 6 +++---
 osu.Game/Screens/Edit/Editor.cs                           | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
index 9722c60cba..981967e413 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorTestGameplay.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Tests.Visual.Editing
                 // this test cares about checking the background belonging to the editor specifically, so check that using reference equality
                 // (as `.Equals()` cannot discern between the two, as they technically share the same database GUID).
                 var background = this.ChildrenOfType<BackgroundScreenBeatmap>().Single(b => ReferenceEquals(b.Beatmap.BeatmapInfo, EditorBeatmap.BeatmapInfo));
-                return background.DimAmount.Value == editorDim.Value && background.BlurAmount.Value == 0;
+                return background.DimWhenUserSettingsIgnored.Value == editorDim.Value && background.BlurAmount.Value == 0;
             });
             AddAssert("no mods selected", () => SelectedMods.Value.Count == 0);
         }
@@ -119,7 +119,7 @@ namespace osu.Game.Tests.Visual.Editing
                 // this test cares about checking the background belonging to the editor specifically, so check that using reference equality
                 // (as `.Equals()` cannot discern between the two, as they technically share the same database GUID).
                 var background = this.ChildrenOfType<BackgroundScreenBeatmap>().Single(b => ReferenceEquals(b.Beatmap.BeatmapInfo, EditorBeatmap.BeatmapInfo));
-                return background.DimAmount.Value == editorDim.Value && background.BlurAmount.Value == 0;
+                return background.DimWhenUserSettingsIgnored.Value == editorDim.Value && background.BlurAmount.Value == 0;
             });
 
             AddStep("start track", () => EditorClock.Start());
diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index 62dd4e19b0..0b20159190 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -47,9 +47,9 @@ namespace osu.Game.Graphics.Containers
         protected Bindable<double> UserDimLevel { get; private set; } = null!;
 
         /// <summary>
-        /// The amount of dim to be override if <see cref="IgnoreUserSettings"/> is true.
+        /// The amount of dim to be used when <see cref="IgnoreUserSettings"/> is <c>true</c>.
         /// </summary>
-        public Bindable<float> DimAmount { get; set; } = new Bindable<float>();
+        public Bindable<float> DimWhenUserSettingsIgnored { get; set; } = new Bindable<float>();
 
         protected Bindable<bool> LightenDuringBreaks { get; private set; } = null!;
 
@@ -57,7 +57,7 @@ namespace osu.Game.Graphics.Containers
 
         private float breakLightening => LightenDuringBreaks.Value && IsBreakTime.Value ? BREAK_LIGHTEN_AMOUNT : 0;
 
-        protected float DimLevel => Math.Max(!IgnoreUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : DimAmount.Value, 0);
+        protected float DimLevel => Math.Max(!IgnoreUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : DimWhenUserSettingsIgnored.Value, 0);
 
         protected override Container<Drawable> Content => dimContent;
 
@@ -79,7 +79,7 @@ namespace osu.Game.Graphics.Containers
             ShowStoryboard = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
 
             UserDimLevel.ValueChanged += _ => UpdateVisuals();
-            DimAmount.ValueChanged += _ => UpdateVisuals();
+            DimWhenUserSettingsIgnored.ValueChanged += _ => UpdateVisuals();
             LightenDuringBreaks.ValueChanged += _ => UpdateVisuals();
             IsBreakTime.ValueChanged += _ => UpdateVisuals();
             ShowStoryboard.ValueChanged += _ => UpdateVisuals();
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 9f3e99d793..4d84a8194d 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -44,9 +44,9 @@ namespace osu.Game.Screens.Backgrounds
         public readonly Bindable<float> BlurAmount = new BindableFloat();
 
         /// <summary>
-        /// The amount of dim to be override if <see cref="IgnoreUserSettings"/> is true.
+        /// The amount of dim to be used when <see cref="IgnoreUserSettings"/> is <c>true</c>.
         /// </summary>
-        public readonly Bindable<float> DimAmount = new Bindable<float>();
+        public readonly Bindable<float> DimWhenUserSettingsIgnored = new Bindable<float>();
 
         internal readonly IBindable<bool> IsBreakTime = new Bindable<bool>();
 
@@ -63,7 +63,7 @@ namespace osu.Game.Screens.Backgrounds
             dimmable.IgnoreUserSettings.BindTo(IgnoreUserSettings);
             dimmable.IsBreakTime.BindTo(IsBreakTime);
             dimmable.BlurAmount.BindTo(BlurAmount);
-            dimmable.DimAmount.BindTo(DimAmount);
+            dimmable.DimWhenUserSettingsIgnored.BindTo(DimWhenUserSettingsIgnored);
 
             StoryboardReplacesBackground.BindTo(dimmable.StoryboardReplacesBackground);
         }
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index bd0c4cfca4..990152471a 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -637,7 +637,7 @@ namespace osu.Game.Screens.Edit
             ApplyToBackground(b =>
             {
                 b.IgnoreUserSettings.Value = true;
-                b.DimAmount.Value = editorBackgroundDim.Value;
+                b.DimWhenUserSettingsIgnored.Value = editorBackgroundDim.Value;
                 b.BlurAmount.Value = 0;
             });
         }
@@ -668,7 +668,7 @@ namespace osu.Game.Screens.Edit
             ApplyToBackground(b =>
             {
                 //b.DimAmount.UnbindAll();
-                b.DimAmount.Value = 0;
+                b.DimWhenUserSettingsIgnored.Value = 0;
             });
             resetTrack();
 

From a44c7c751497d72eb33e4106a0b7baac184254a4 Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 2 Nov 2022 19:56:35 +0900
Subject: [PATCH 09/13] range and precision for `EditorWaveformOpacity`

---
 osu.Game/Configuration/OsuConfigManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index e9cfcd56c5..b832d1e310 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -172,7 +172,7 @@ namespace osu.Game.Configuration
 
             SetDefault(OsuSetting.DiscordRichPresence, DiscordRichPresenceMode.Full);
 
-            SetDefault(OsuSetting.EditorWaveformOpacity, 0.25f);
+            SetDefault(OsuSetting.EditorWaveformOpacity, 0.25f, 0f, 1f, 0.25f);
 
             SetDefault(OsuSetting.LastProcessedMetadataId, -1);
         }

From 7073d8dd8e9f75f4756adf3fef7a9c6035db911c Mon Sep 17 00:00:00 2001
From: cdwcgt <cdwcgt@cdwcgt.top>
Date: Wed, 2 Nov 2022 19:57:01 +0900
Subject: [PATCH 10/13] range and precision for `EditorDim`

---
 osu.Game/Configuration/OsuConfigManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index b832d1e310..3c619d2ddd 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.PositionalHitsoundsLevel, 0.2f, 0, 1);
             SetDefault(OsuSetting.DimLevel, 0.7, 0, 1, 0.01);
             SetDefault(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
-            SetDefault(OsuSetting.EditorDim, 0.25f);
+            SetDefault(OsuSetting.EditorDim, 0.25f, 0f, 1f, 0.25f);
             SetDefault(OsuSetting.LightenDuringBreaks, true);
 
             SetDefault(OsuSetting.HitLighting, true);

From 7ee9018a94c0e2bfb81c9fca6d3a067d1075f437 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 8 Nov 2022 03:18:12 +0300
Subject: [PATCH 11/13] Always display menu cursor when game is not focused

---
 .../Graphics/Cursor/MenuCursorContainer.cs    | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Cursor/MenuCursorContainer.cs b/osu.Game/Graphics/Cursor/MenuCursorContainer.cs
index af542989ff..adc0f81daf 100644
--- a/osu.Game/Graphics/Cursor/MenuCursorContainer.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursorContainer.cs
@@ -70,7 +70,8 @@ namespace osu.Game.Graphics.Cursor
         private OsuGame? game { get; set; }
 
         private readonly IBindable<bool> lastInputWasMouse = new BindableBool();
-        private readonly IBindable<bool> isIdle = new BindableBool();
+        private readonly IBindable<bool> gameActive = new BindableBool(true);
+        private readonly IBindable<bool> gameIdle = new BindableBool();
 
         protected override void LoadComplete()
         {
@@ -81,8 +82,11 @@ namespace osu.Game.Graphics.Cursor
 
             if (game != null)
             {
-                isIdle.BindTo(game.IsIdle);
-                isIdle.BindValueChanged(_ => updateState());
+                gameIdle.BindTo(game.IsIdle);
+                gameIdle.BindValueChanged(_ => updateState());
+
+                gameActive.BindTo(game.IsActive);
+                gameActive.BindValueChanged(_ => updateState());
             }
         }
 
@@ -90,7 +94,7 @@ namespace osu.Game.Graphics.Cursor
 
         private void updateState()
         {
-            bool combinedVisibility = State.Value == Visibility.Visible && (lastInputWasMouse.Value || !hideCursorOnNonMouseInput) && !isIdle.Value;
+            bool combinedVisibility = getCursorVisibility();
 
             if (visible == combinedVisibility)
                 return;
@@ -103,6 +107,27 @@ namespace osu.Game.Graphics.Cursor
                 PopOut();
         }
 
+        private bool getCursorVisibility()
+        {
+            // do not display when explicitly set to hidden state.
+            if (State.Value == Visibility.Hidden)
+                return false;
+
+            // only hide cursor when game is focused, otherwise it should always be displayed.
+            if (gameActive.Value)
+            {
+                // do not display when last input is not mouse.
+                if (hideCursorOnNonMouseInput && !lastInputWasMouse.Value)
+                    return false;
+
+                // do not display when game is idle.
+                if (gameIdle.Value)
+                    return false;
+            }
+
+            return true;
+        }
+
         protected override void Update()
         {
             base.Update();

From 349d262c1820d5056282bc2a3a2014a6535a17af Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Nov 2022 18:05:22 +0900
Subject: [PATCH 12/13] Remove commented unbind

---
 osu.Game/Screens/Edit/Editor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 990152471a..df3c1f7ec4 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -667,9 +667,9 @@ namespace osu.Game.Screens.Edit
 
             ApplyToBackground(b =>
             {
-                //b.DimAmount.UnbindAll();
                 b.DimWhenUserSettingsIgnored.Value = 0;
             });
+
             resetTrack();
 
             refetchBeatmap();

From 9650ae1329b07cf8801601186d4dae91c1fe7929 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Nov 2022 17:20:37 +0900
Subject: [PATCH 13/13] Limit editor background dim to 75% maximum

---
 osu.Game/Configuration/OsuConfigManager.cs     | 2 +-
 osu.Game/Screens/Edit/BackgroundDimMenuItem.cs | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 3c619d2ddd..fccd1a8715 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -121,7 +121,6 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.PositionalHitsoundsLevel, 0.2f, 0, 1);
             SetDefault(OsuSetting.DimLevel, 0.7, 0, 1, 0.01);
             SetDefault(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
-            SetDefault(OsuSetting.EditorDim, 0.25f, 0f, 1f, 0.25f);
             SetDefault(OsuSetting.LightenDuringBreaks, true);
 
             SetDefault(OsuSetting.HitLighting, true);
@@ -172,6 +171,7 @@ namespace osu.Game.Configuration
 
             SetDefault(OsuSetting.DiscordRichPresence, DiscordRichPresenceMode.Full);
 
+            SetDefault(OsuSetting.EditorDim, 0.25f, 0f, 0.75f, 0.25f);
             SetDefault(OsuSetting.EditorWaveformOpacity, 0.25f, 0f, 1f, 0.25f);
 
             SetDefault(OsuSetting.LastProcessedMetadataId, -1);
diff --git a/osu.Game/Screens/Edit/BackgroundDimMenuItem.cs b/osu.Game/Screens/Edit/BackgroundDimMenuItem.cs
index b8644ed690..b5a33f06e7 100644
--- a/osu.Game/Screens/Edit/BackgroundDimMenuItem.cs
+++ b/osu.Game/Screens/Edit/BackgroundDimMenuItem.cs
@@ -23,7 +23,6 @@ namespace osu.Game.Screens.Edit
                 createMenuItem(0.25f),
                 createMenuItem(0.5f),
                 createMenuItem(0.75f),
-                createMenuItem(1f),
             };
 
             this.backgroudDim = backgroudDim;