diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs index d26fc2ec43..fff5dc62c6 100644 --- a/osu.Game/Configuration/OsuConfigManager.cs +++ b/osu.Game/Configuration/OsuConfigManager.cs @@ -60,7 +60,7 @@ namespace osu.Game.Configuration SetDefault(OsuSetting.ToolbarClockDisplayMode, ToolbarClockDisplayMode.Full); - SetDefault(OsuSetting.SongSelectBackgoundBlurLevel, 1f, 0, 1f, 0.01f); + SetDefault(OsuSetting.SongSelectBackgoundBlur, true); // Online settings SetDefault(OsuSetting.Username, string.Empty); @@ -341,7 +341,7 @@ namespace osu.Game.Configuration ChatDisplayHeight, BeatmapListingCardSize, ToolbarClockDisplayMode, - SongSelectBackgoundBlurLevel, + SongSelectBackgoundBlur, Version, ShowFirstRunSetup, ShowConvertedBeatmaps, diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs index 3228ebfe44..ab5a3a1280 100644 --- a/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs +++ b/osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs @@ -43,10 +43,10 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface Current = config.GetBindable(OsuSetting.ModSelectHotkeyStyle), ClassicDefault = ModSelectHotkeyStyle.Classic }, - new SettingsSlider + new SettingsCheckbox { LabelText = UserInterfaceStrings.SongSelectBackgroundBlurLevel, - Current = config.GetBindable(OsuSetting.SongSelectBackgoundBlurLevel) + Current = config.GetBindable(OsuSetting.SongSelectBackgoundBlur) } }; } diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs index dbd948ff86..bbb88052aa 100644 --- a/osu.Game/Screens/Select/SongSelect.cs +++ b/osu.Game/Screens/Select/SongSelect.cs @@ -125,12 +125,12 @@ namespace osu.Game.Screens.Select [Resolved] internal IOverlayManager? OverlayManager { get; private set; } - private Bindable backgroundBlurLevel { get; set; } = new BindableFloat(); + private Bindable backgroundBlurLevel { get; set; } = new BindableBool(); [BackgroundDependencyLoader(true)] private void load(AudioManager audio, OsuColour colours, ManageCollectionsDialog? manageCollectionsDialog, DifficultyRecommender? recommender, OsuConfigManager config) { - backgroundBlurLevel = config.GetBindable(OsuSetting.SongSelectBackgoundBlurLevel); + backgroundBlurLevel = config.GetBindable(OsuSetting.SongSelectBackgoundBlur); backgroundBlurLevel.BindValueChanged(e => { if (this.IsCurrentScreen()) @@ -138,7 +138,7 @@ namespace osu.Game.Screens.Select ApplyToBackground(background => { background.IgnoreUserSettings.Value = true; - background.BlurAmount.Value = e.NewValue * BACKGROUND_BLUR; + background.BlurAmount.Value = e.NewValue ? BACKGROUND_BLUR : 0; }); } }, true); @@ -758,7 +758,7 @@ namespace osu.Game.Screens.Select ApplyToBackground(backgroundModeBeatmap => { backgroundModeBeatmap.Beatmap = beatmap; - backgroundModeBeatmap.BlurAmount.Value = backgroundBlurLevel.Value * BACKGROUND_BLUR; + backgroundModeBeatmap.BlurAmount.Value = backgroundBlurLevel.Value ? BACKGROUND_BLUR : 0f; backgroundModeBeatmap.FadeColour(Color4.White, 250); });