RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-15 01:27:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14774 from peppy/move-allow-adjustments-specification

Browse Source 
Move `AllowTrackAdjustments` specification to `RoomSubScreen`
This commit is contained in:
Dan Balasescu 2021-09-17 13:48:44 +09:00 committed by GitHub
commit 87dbdfe632
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
View File

@ -37,8 +37,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
{ {
public override string Title => "Lounge"; public override string Title => "Lounge";
public override bool? AllowTrackAdjustments => false;
protected override BackgroundScreen CreateBackground() => new LoungeBackgroundScreen protected override BackgroundScreen CreateBackground() => new LoungeBackgroundScreen
{ {
SelectedRoom = { BindTarget = SelectedRoom } SelectedRoom = { BindTarget = SelectedRoom }

2
osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
View File

@ -29,6 +29,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
[Cached(typeof(IBindable<PlaylistItem>))] [Cached(typeof(IBindable<PlaylistItem>))]
protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>(); protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
public override bool? AllowTrackAdjustments => true;
protected override BackgroundScreen CreateBackground() => new RoomBackgroundScreen(Room.Playlist.FirstOrDefault()) protected override BackgroundScreen CreateBackground() => new RoomBackgroundScreen(Room.Playlist.FirstOrDefault())
{ {
SelectedItem = { BindTarget = SelectedItem } SelectedItem = { BindTarget = SelectedItem }

2
osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
View File

@ -11,8 +11,6 @@ namespace osu.Game.Screens.OnlinePlay
{ {
public override bool DisallowExternalBeatmapRulesetChanges => false; public override bool DisallowExternalBeatmapRulesetChanges => false;
public override bool? AllowTrackAdjustments => true;
public virtual string ShortTitle => Title; public virtual string ShortTitle => Title;
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]