sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 16:43:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5709 from peppy/fix-context-menu-in-chat

Browse Source 
Fix chat context menus displaying out-of-bounds
This commit is contained in:
Dan Balasescu
2019-08-14 11:40:23 +09:00
committed by GitHub
parent c3a257ea36 52f42ddade
commit 8307ee330c
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Overlays/Chat/DrawableChannel.cs
View File

@ -30,18 +30,16 @@ namespace osu.Game.Overlays.Chat
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
Children = new Drawable[] Child = new OsuContextMenuContainer
{ {
scroll = new OsuScrollContainer RelativeSizeAxes = Axes.Both,
Masking = true,
Child = scroll = new OsuScrollContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
// Some chat lines have effects that slightly protrude to the bottom, // Some chat lines have effects that slightly protrude to the bottom,
// which we do not want to mask away, hence the padding. // which we do not want to mask away, hence the padding.
Padding = new MarginPadding { Bottom = 5 }, Padding = new MarginPadding { Bottom = 5 },
Child = new OsuContextMenuContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Child = ChatLineFlow = new ChatLineContainer Child = ChatLineFlow = new ChatLineContainer
{ {
Padding = new MarginPadding { Left = 20, Right = 20 }, Padding = new MarginPadding { Left = 20, Right = 20 },
@ -50,7 +48,6 @@ namespace osu.Game.Overlays.Chat
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
} }
}, },
}
}; };
newMessagesArrived(Channel.Messages); newMessagesArrived(Channel.Messages);