h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 12:57:36 +08:00
Code Issues Releases Wiki Activity

Remove FollowPlayback setting

Browse Source
This commit is contained in:
Roman Kapustin 2019-10-07 19:44:22 +03:00
parent eda4a27b45
commit e00992dfd8
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,8 +117,6 @@ namespace osu.Game.Configuration
Set(OsuSetting.UIHoldActivationDelay, 200f, 0f, 500f, 50f); Set(OsuSetting.UIHoldActivationDelay, 200f, 0f, 500f, 50f);
Set(OsuSetting.IntroSequence, IntroSequence.Triangles); Set(OsuSetting.IntroSequence, IntroSequence.Triangles);
Set(OsuSetting.FollowPlayback, true);
} }
public OsuConfigManager(Storage storage) public OsuConfigManager(Storage storage)
@ -188,7 +186,6 @@ namespace osu.Game.Configuration
UIScale, UIScale,
IntroSequence, IntroSequence,
UIHoldActivationDelay, UIHoldActivationDelay,
HitLighting, HitLighting
FollowPlayback
} }
} }

9
osu.Game/Overlays/Music/PlaylistList.cs
View File

@ -11,7 +11,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osuTK; using osuTK;
@ -53,8 +52,6 @@ namespace osu.Game.Overlays.Music
private IBindableList<BeatmapSetInfo> beatmaps; private IBindableList<BeatmapSetInfo> beatmaps;
private IBindable<bool> followPlayback;
[Resolved] [Resolved]
private MusicController musicController { get; set; } private MusicController musicController { get; set; }
@ -79,10 +76,8 @@ namespace osu.Game.Overlays.Music
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(IBindable<WorkingBeatmap> beatmap, OsuConfigManager configManager) private void load(IBindable<WorkingBeatmap> beatmap)
{ {
followPlayback = configManager.GetBindable<bool>(OsuSetting.FollowPlayback);
beatmaps = musicController.BeatmapSets.GetBoundCopy(); beatmaps = musicController.BeatmapSets.GetBoundCopy();
beatmaps.ItemsAdded += i => i.ForEach(addBeatmapSet); beatmaps.ItemsAdded += i => i.ForEach(addBeatmapSet);
beatmaps.ItemsRemoved += i => i.ForEach(removeBeatmapSet); beatmaps.ItemsRemoved += i => i.ForEach(removeBeatmapSet);
@ -116,7 +111,7 @@ namespace osu.Game.Overlays.Music
foreach (PlaylistItem s in items.Children) foreach (PlaylistItem s in items.Children)
{ {
s.Selected = s.BeatmapSetInfo.ID == beatmapBacking.Value.BeatmapSetInfo?.ID; s.Selected = s.BeatmapSetInfo.ID == beatmapBacking.Value.BeatmapSetInfo?.ID;
if (s.Selected && followPlayback.Value) if (s.Selected)
ScrollIntoView(s); ScrollIntoView(s);
} }
} }

5
osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
View File

@ -17,11 +17,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
{ {
Children = new Drawable[] Children = new Drawable[]
{ {
new SettingsCheckbox
{
LabelText = "Scroll playlist on song change",
Bindable = config.GetBindable<bool>(OsuSetting.FollowPlayback)
},
new SettingsCheckbox new SettingsCheckbox
{ {
LabelText = "Rotate cursor when dragging", LabelText = "Rotate cursor when dragging",