h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 14:02:55 +08:00
Code Issues Releases Wiki Activity

Add host under room title

Browse Source
This commit is contained in:
smoogipoo 2021-07-12 16:28:22 +09:00
parent 4ac812de86
commit aba09b20a5
2 changed files with 62 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoom.cs
View File

@ -8,6 +8,7 @@ using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Rooms; using osu.Game.Online.Rooms;
using osu.Game.Online.Rooms.RoomStatuses; using osu.Game.Online.Rooms.RoomStatuses;
using osu.Game.Screens.OnlinePlay.Lounge.Components; using osu.Game.Screens.OnlinePlay.Lounge.Components;
using osu.Game.Users;
using osuTK; using osuTK;
namespace osu.Game.Tests.Visual.Multiplayer namespace osu.Game.Tests.Visual.Multiplayer
@ -27,27 +28,31 @@ namespace osu.Game.Tests.Visual.Multiplayer
{ {
createDrawableRoom(new Room createDrawableRoom(new Room
{ {
Name = { Value = "Room name: Open - ending in 1 day" }, Name = { Value = "Room 1" },
Status = { Value = new RoomStatusOpen() }, Status = { Value = new RoomStatusOpen() },
EndDate = { Value = DateTimeOffset.Now.AddDays(1) } EndDate = { Value = DateTimeOffset.Now.AddDays(1) },
Host = { Value = new User { Username = "peppy", Id = 2 } }
}), }),
createDrawableRoom(new Room createDrawableRoom(new Room
{ {
Name = { Value = "Room name: Playing - ending in 1 day" }, Name = { Value = "Room 2" },
Status = { Value = new RoomStatusPlaying() }, Status = { Value = new RoomStatusPlaying() },
EndDate = { Value = DateTimeOffset.Now.AddDays(1) } EndDate = { Value = DateTimeOffset.Now.AddDays(1) },
Host = { Value = new User { Username = "peppy", Id = 2 } }
}), }),
createDrawableRoom(new Room createDrawableRoom(new Room
{ {
Name = { Value = "Room name: Ended" }, Name = { Value = "Room 3" },
Status = { Value = new RoomStatusEnded() }, Status = { Value = new RoomStatusEnded() },
EndDate = { Value = DateTimeOffset.Now } EndDate = { Value = DateTimeOffset.Now },
Host = { Value = new User { Username = "peppy", Id = 2 } }
}), }),
createDrawableRoom(new Room createDrawableRoom(new Room
{ {
Name = { Value = "Room name: Open" }, Name = { Value = "Room 4" },
Status = { Value = new RoomStatusOpen() }, Status = { Value = new RoomStatusOpen() },
Category = { Value = RoomCategory.Realtime } Category = { Value = RoomCategory.Realtime },
Host = { Value = new User { Username = "peppy", Id = 2 } }
}), }),
} }
}; };

52
osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
View File

@ -187,11 +187,17 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
}, },
} }
}, },
new RoomName new FillFlowContainer
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Font = OsuFont.GetFont(size: 28) AutoSizeAxes = Axes.Both,
Direction = FillDirection.Vertical,
Children = new Drawable[]
{
new RoomNameText(),
new RoomHostText()
}
}, },
new FillFlowContainer new FillFlowContainer
{ {
@ -262,11 +268,16 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
protected override bool ShouldBeConsideredForInput(Drawable child) => state == SelectionState.Selected; protected override bool ShouldBeConsideredForInput(Drawable child) => state == SelectionState.Selected;
private class RoomName : OsuSpriteText private class RoomNameText : OsuSpriteText
{ {
[Resolved(typeof(Room), nameof(Online.Rooms.Room.Name))] [Resolved(typeof(Room), nameof(Online.Rooms.Room.Name))]
private Bindable<string> name { get; set; } private Bindable<string> name { get; set; }
public RoomNameText()
{
Font = OsuFont.GetFont(size: 24);
}
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
@ -274,6 +285,41 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
} }
} }
private class RoomHostText : OnlinePlayComposite
{
private LinkFlowContainer hostText;
public RoomHostText()
{
AutoSizeAxes = Axes.Both;
}
[BackgroundDependencyLoader]
private void load()
{
InternalChild = hostText = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 14))
{
AutoSizeAxes = Axes.Both
};
}
protected override void LoadComplete()
{
base.LoadComplete();
Host.BindValueChanged(host =>
{
hostText.Clear();
if (host.NewValue != null)
{
hostText.AddText("hosted by ");
hostText.AddUserLink(host.NewValue);
}
}, true);
}
}
public MenuItem[] ContextMenuItems => new MenuItem[] public MenuItem[] ContextMenuItems => new MenuItem[]
{ {
new OsuMenuItem("Create copy", MenuItemType.Standard, () => new OsuMenuItem("Create copy", MenuItemType.Standard, () =>