mirror of
https://github.com/ppy/osu
synced 2024-12-23 23:33:36 +00:00
Improve naming
This commit is contained in:
parent
f390e558c7
commit
ab42fac43a
@ -3,9 +3,9 @@
|
||||
|
||||
namespace osu.Game.Configuration
|
||||
{
|
||||
public enum BackgroundMode
|
||||
public enum BackgroundSource
|
||||
{
|
||||
Default,
|
||||
Skin,
|
||||
Beatmap
|
||||
}
|
||||
}
|
@ -118,7 +118,7 @@ namespace osu.Game.Configuration
|
||||
|
||||
Set(OsuSetting.IntroSequence, IntroSequence.Triangles);
|
||||
|
||||
Set(OsuSetting.BackgroundMode, BackgroundMode.Default);
|
||||
Set(OsuSetting.MenuBackgroundSource, BackgroundSource.Skin);
|
||||
}
|
||||
|
||||
public OsuConfigManager(Storage storage)
|
||||
@ -189,6 +189,6 @@ namespace osu.Game.Configuration
|
||||
IntroSequence,
|
||||
UIHoldActivationDelay,
|
||||
HitLighting,
|
||||
BackgroundMode
|
||||
MenuBackgroundSource
|
||||
}
|
||||
}
|
||||
|
@ -34,11 +34,11 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
|
||||
Bindable = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence),
|
||||
Items = Enum.GetValues(typeof(IntroSequence)).Cast<IntroSequence>()
|
||||
},
|
||||
new SettingsDropdown<BackgroundMode>
|
||||
new SettingsDropdown<BackgroundSource>
|
||||
{
|
||||
LabelText = "Background",
|
||||
Bindable = config.GetBindable<BackgroundMode>(OsuSetting.BackgroundMode),
|
||||
Items = Enum.GetValues(typeof(BackgroundMode)).Cast<BackgroundMode>()
|
||||
LabelText = "Background source",
|
||||
Bindable = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource),
|
||||
Items = Enum.GetValues(typeof(BackgroundSource)).Cast<BackgroundSource>()
|
||||
}
|
||||
};
|
||||
}
|
||||
|
@ -26,7 +26,7 @@ namespace osu.Game.Screens.Backgrounds
|
||||
|
||||
private Bindable<User> user;
|
||||
private Bindable<Skin> skin;
|
||||
private Bindable<BackgroundMode> mode;
|
||||
private Bindable<BackgroundSource> mode;
|
||||
|
||||
[Resolved]
|
||||
private IBindable<WorkingBeatmap> beatmap { get; set; }
|
||||
@ -41,7 +41,7 @@ namespace osu.Game.Screens.Backgrounds
|
||||
{
|
||||
user = api.LocalUser.GetBoundCopy();
|
||||
skin = skinManager.CurrentSkin.GetBoundCopy();
|
||||
mode = config.GetBindable<BackgroundMode>(OsuSetting.BackgroundMode);
|
||||
mode = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource);
|
||||
|
||||
user.ValueChanged += _ => Next();
|
||||
skin.ValueChanged += _ => Next();
|
||||
@ -78,7 +78,7 @@ namespace osu.Game.Screens.Backgrounds
|
||||
{
|
||||
switch (mode.Value)
|
||||
{
|
||||
case BackgroundMode.Beatmap:
|
||||
case BackgroundSource.Beatmap:
|
||||
newBackground = new BeatmapBackground(beatmap.Value, backgroundName);
|
||||
break;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user