RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-15 11:25:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

adding setting to adjust blur of the background of the song select screen

Browse Source
This commit is contained in:
Jérémiah DÉCOMBE 2023-01-23 13:53:31 +01:00
parent d695214ae1
commit 6daa364779
4 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Configuration/OsuConfigManager.cs
View File

@ -60,6 +60,8 @@ namespace osu.Game.Configuration
SetDefault(OsuSetting.ToolbarClockDisplayMode, ToolbarClockDisplayMode.Full);
SetDefault(OsuSetting.BeatmapSelectionBlurLevel, 1f, 0, 1f, 0.01f);
// Online settings
SetDefault(OsuSetting.Username, string.Empty);
SetDefault(OsuSetting.Token, string.Empty);
@ -339,6 +341,7 @@ namespace osu.Game.Configuration
ChatDisplayHeight,
BeatmapListingCardSize,
ToolbarClockDisplayMode,
BeatmapSelectionBlurLevel,
Version,
ShowFirstRunSetup,
ShowConvertedBeatmaps,

6
osu.Game/Localisation/UserInterfaceStrings.cs
View File

@ -109,6 +109,12 @@ namespace osu.Game.Localisation
/// </summary>
public static LocalisableString ModSelectHotkeyStyle => new TranslatableString(getKey(@"mod_select_hotkey_style"), @"Mod select hotkey style");
/// <summary>
/// "Beatmap selection blur level"
/// </summary>
public static LocalisableString BeatmapSelectionBlurLevel => new TranslatableString(getKey(@"beatmap_selection_blur_level"), @"Beatmap selection blur level");
/// <summary>
/// "no limit"
/// </summary>

5
osu.Game/Overlays/Settings/Sections/UserInterface/SongSelectSettings.cs
View File

@ -42,6 +42,11 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
LabelText = UserInterfaceStrings.ModSelectHotkeyStyle,
Current = config.GetBindable<ModSelectHotkeyStyle>(OsuSetting.ModSelectHotkeyStyle),
ClassicDefault = ModSelectHotkeyStyle.Classic
},
new SettingsSlider<float>
{
LabelText = UserInterfaceStrings.BeatmapSelectionBlurLevel,
Current = config.GetBindable<float>(OsuSetting.BeatmapSelectionBlurLevel)
}
};
}

33
osu.Game/Screens/Select/SongSelect.cs
View File

@ -35,6 +35,7 @@ using osu.Game.Collections;
using osu.Game.Graphics.UserInterface;
using System.Diagnostics;
using osu.Framework.Extensions.ObjectExtensions;
using osu.Game.Configuration;
using osu.Game.Screens.Play;
using osu.Game.Skinning;
@ -124,9 +125,26 @@ namespace osu.Game.Screens.Select
[Resolved]
internal IOverlayManager? OverlayManager { get; private set; }
[BackgroundDependencyLoader(true)]
private void load(AudioManager audio, OsuColour colours, ManageCollectionsDialog? manageCollectionsDialog, DifficultyRecommender? recommender)
private Bindable<float> backgroundBlurLevel { get; set; } = new BindableFloat();
private void applyBackgroundBlur(float v)
{
ApplyToBackground(background =>
{
background.IgnoreUserSettings.Value = true;
background.BlurAmount.Value = v * BACKGROUND_BLUR;
});
}
private void applyBackgroundBlur(ValueChangedEvent<float> v)
{
applyBackgroundBlur(v.NewValue);
}
[BackgroundDependencyLoader(true)]
private void load(AudioManager audio, OsuColour colours, ManageCollectionsDialog? manageCollectionsDialog, DifficultyRecommender? recommender, OsuConfigManager config)
{
backgroundBlurLevel = config.GetBindable<float>(OsuSetting.BeatmapSelectionBlurLevel);
LoadComponentAsync(Carousel = new BeatmapCarousel
{
AllowSelection = false, // delay any selection until our bindables are ready to make a good choice.
@ -549,6 +567,9 @@ namespace osu.Game.Screens.Select
{
base.OnEntering(e);
backgroundBlurLevel.ValueChanged += applyBackgroundBlur;
applyBackgroundBlur(backgroundBlurLevel.Value);
this.FadeInFromZero(250);
FilterControl.Activate();
@ -596,6 +617,8 @@ namespace osu.Game.Screens.Select
public override void OnResuming(ScreenTransitionEvent e)
{
base.OnResuming(e);
backgroundBlurLevel.ValueChanged += applyBackgroundBlur;
applyBackgroundBlur(backgroundBlurLevel.Value);
// required due to https://github.com/ppy/osu-framework/issues/3218
ModSelect.SelectedMods.Disabled = false;
@ -641,6 +664,8 @@ namespace osu.Game.Screens.Select
// Without this, it's possible for a transfer to happen while we are not the current screen.
transferRulesetValue();
backgroundBlurLevel.ValueChanged -= applyBackgroundBlur;
ModSelect.SelectedMods.UnbindFrom(selectedMods);
playExitingTransition();
@ -649,6 +674,8 @@ namespace osu.Game.Screens.Select
public override bool OnExiting(ScreenExitEvent e)
{
backgroundBlurLevel.ValueChanged -= applyBackgroundBlur;
if (base.OnExiting(e))
return true;
@ -742,7 +769,7 @@ namespace osu.Game.Screens.Select
ApplyToBackground(backgroundModeBeatmap =>
{
backgroundModeBeatmap.Beatmap = beatmap;
backgroundModeBeatmap.BlurAmount.Value = BACKGROUND_BLUR;
backgroundModeBeatmap.BlurAmount.Value = backgroundBlurLevel.Value * BACKGROUND_BLUR;
backgroundModeBeatmap.FadeColour(Color4.White, 250);
});