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

Update popover logic to take advantage of new explicit popup functionality

Browse Source
This commit is contained in:
Dean Herbert 2021-07-12 14:53:12 +09:00
parent a3e0168a46
commit b4ca6b6188
1 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ using System.Collections.Generic;
using osu.Framework; using osu.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Extensions;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
@ -241,12 +242,25 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
Alpha = 0; Alpha = 0;
} }
public Popover GetPopover() => new PasswordEntryPopover(Room);
public MenuItem[] ContextMenuItems => new MenuItem[]
{
new OsuMenuItem("Create copy", MenuItemType.Standard, () =>
{
parentScreen?.OpenNewRoom(Room.CreateCopy());
})
};
public bool OnPressed(GlobalAction action) public bool OnPressed(GlobalAction action)
{ {
if (selectedRoom.Value != Room)
return false;
switch (action) switch (action)
{ {
case GlobalAction.Select: case GlobalAction.Select:
// TODO: this needs to be able to show the popover on demand. Click();
return true; return true;
} }
@ -259,6 +273,33 @@ 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;
protected override bool OnMouseDown(MouseDownEvent e)
{
if (selectedRoom.Value != Room)
return true;
return base.OnMouseDown(e);
}
protected override bool OnClick(ClickEvent e)
{
if (Room != selectedRoom.Value)
{
selectedRoom.Value = Room;
return true;
}
if (Room.HasPassword.Value)
{
this.ShowPopover();
return true;
}
lounge?.Join(Room, null);
return base.OnClick(e);
}
private class RoomName : OsuSpriteText private class RoomName : OsuSpriteText
{ {
[Resolved(typeof(Room), nameof(Online.Rooms.Room.Name))] [Resolved(typeof(Room), nameof(Online.Rooms.Room.Name))]
@ -271,14 +312,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
} }
} }
public MenuItem[] ContextMenuItems => new MenuItem[]
{
new OsuMenuItem("Create copy", MenuItemType.Standard, () =>
{
parentScreen?.OpenNewRoom(Room.CreateCopy());
})
};
private class PasswordProtectedIcon : CompositeDrawable private class PasswordProtectedIcon : CompositeDrawable
{ {
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -312,33 +345,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
} }
} }
protected override bool OnMouseDown(MouseDownEvent e)
{
if (selectedRoom.Value != Room)
return true;
return base.OnMouseDown(e);
}
protected override bool OnClick(ClickEvent e)
{
if (Room != selectedRoom.Value)
{
selectedRoom.Value = Room;
return true;
}
if (Room.HasPassword.Value)
// we want our popover to show. this is a bit of a hack.
return false;
lounge?.Join(Room, null);
return base.OnClick(e);
}
public Popover GetPopover() => new PasswordEntryPopover(Room);
public class PasswordEntryPopover : Popover public class PasswordEntryPopover : Popover
{ {
[Resolved(canBeNull: true)] [Resolved(canBeNull: true)]