h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-24 09:37:19 +08:00
Code Issues Releases Wiki Activity

address frenzibyte review (refactor bindable flow, clean up CI stuff)

Browse Source
This commit is contained in:
hwabis 2022-03-19 13:05:35 -04:00
parent 5d16519a82
commit ef823d58a7
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerPlaylist.cs
View File

@ -70,8 +70,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match.Playlist
{
base.LoadComplete();
DisplayMode.BindValueChanged(onDisplayModeChanged, true);
queueList.Items.BindCollectionChanged(
(_, __) => playlistTabControl.queueListCount.Value = queueList.Items.Count, true);
playlistTabControl.QueueItems.BindTarget = queueList.Items;
}
private void onDisplayModeChanged(ValueChangedEvent<MultiplayerPlaylistDisplayMode> mode)

31
osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerPlaylistTabControl.cs
View File

@ -4,31 +4,40 @@
using osu.Framework.Bindables;
using osu.Framework.Graphics.UserInterface;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Rooms;
namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match.Playlist
{
public class MultiplayerPlaylistTabControl : OsuTabControl<MultiplayerPlaylistDisplayMode>
{
public Bindable<int> queueListCount = new Bindable<int>(0);
public MultiplayerPlaylistTabControl()
{
}
public readonly IBindableList<PlaylistItem> QueueItems = new BindableList<PlaylistItem>();
protected override TabItem<MultiplayerPlaylistDisplayMode> CreateTabItem(MultiplayerPlaylistDisplayMode value)
{
if (value == MultiplayerPlaylistDisplayMode.Queue)
return new QueueTabItem(value, queueListCount);
return new OsuTabItem(value);
return new QueueTabItem { QueueItems = { BindTarget = QueueItems } };
return base.CreateTabItem(value);
}
private class QueueTabItem : OsuTabItem
{
public QueueTabItem(MultiplayerPlaylistDisplayMode value, Bindable<int> queueListCount)
: base(value)
public readonly IBindableList<PlaylistItem> QueueItems = new BindableList<PlaylistItem>();
public QueueTabItem()
: base(MultiplayerPlaylistDisplayMode.Queue)
{
queueListCount.BindValueChanged(
_ => Text.Text = "Queue (" + queueListCount.Value + ")", true);
}
protected override void LoadComplete()
{
base.LoadComplete();
QueueItems.BindCollectionChanged((_,__) =>
{
Text.Text = $"Queue";
if (QueueItems.Count != 0)
Text.Text += $" ({QueueItems.Count})";
}, true);
}
}
}