sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-31 10:27:26 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add ability to send pm via context menu

Browse Source
This commit is contained in:
Andrei Zavatski 2020-03-04 12:42:21 +03:00
parent 15e47d8432
commit 8a437e1b54
2 changed files with 70 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Graphics.Cursor;
using osu.Game.Graphics.UserInterfaceV2.Users; using osu.Game.Graphics.UserInterfaceV2.Users;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Users; using osu.Game.Users;
@ -27,7 +28,10 @@ namespace osu.Game.Tests.Visual.UserInterface
public TestSceneUserCard() public TestSceneUserCard()
{ {
Add(new FillFlowContainer Add(new OsuContextMenuContainer
{
RelativeSizeAxes = Axes.Both,
Child = new FillFlowContainer
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@ -84,6 +88,7 @@ namespace osu.Game.Tests.Visual.UserInterface
IsOnline = true, IsOnline = true,
}), }),
} }
}
}); });
} }
} }

17
osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
View File

@ -18,9 +18,9 @@ using JetBrains.Annotations;
using osu.Game.Users.Drawables; using osu.Game.Users.Drawables;
using osuTK; using osuTK;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Overlays.Profile.Header.Components;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osuTK.Graphics; using osuTK.Graphics;
using osu.Game.Online.Chat;
namespace osu.Game.Graphics.UserInterfaceV2.Users namespace osu.Game.Graphics.UserInterfaceV2.Users
{ {
@ -32,7 +32,7 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
protected DelayedLoadUnloadWrapper Background; protected DelayedLoadUnloadWrapper Background;
public UserCard(User user) protected UserCard(User user)
{ {
if (user == null) if (user == null)
throw new ArgumentNullException(nameof(user)); throw new ArgumentNullException(nameof(user));
@ -43,6 +43,12 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
[Resolved(canBeNull: true)] [Resolved(canBeNull: true)]
private UserProfileOverlay profileOverlay { get; set; } private UserProfileOverlay profileOverlay { get; set; }
[Resolved(canBeNull: true)]
private ChannelManager channelManager { get; set; }
[Resolved(canBeNull: true)]
private ChatOverlay chatOverlay { get; set; }
[Resolved] [Resolved]
private OsuColour colours { get; set; } private OsuColour colours { get; set; }
@ -54,7 +60,7 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
Masking = true; Masking = true;
BorderColour = colours.GreyVioletLighter; BorderColour = colours.GreyVioletLighter;
AddRange(new Drawable[] AddRange(new[]
{ {
new Box new Box
{ {
@ -152,6 +158,11 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
public MenuItem[] ContextMenuItems => new MenuItem[] public MenuItem[] ContextMenuItems => new MenuItem[]
{ {
new OsuMenuItem("View Profile", MenuItemType.Highlighted, Action), new OsuMenuItem("View Profile", MenuItemType.Highlighted, Action),
new OsuMenuItem("Send message", MenuItemType.Standard, () =>
{
channelManager?.OpenPrivateChannel(User);
chatOverlay?.Show();
})
}; };
} }
} }