RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-15 18:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add back online view container to chat overlay

Browse Source
This commit is contained in:
Joseph Madamba 2022-06-21 19:06:08 -07:00
parent cf0f32f928
commit 07e0cd53a4
1 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game/Overlays/ChatOverlay.cs
View File

@ -18,6 +18,7 @@ using osu.Game.Configuration;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Localisation; using osu.Game.Localisation;
using osu.Game.Online;
using osu.Game.Online.Chat; using osu.Game.Online.Chat;
using osu.Game.Overlays.Chat; using osu.Game.Overlays.Chat;
using osu.Game.Overlays.Chat.ChannelList; using osu.Game.Overlays.Chat.ChannelList;
@ -100,11 +101,26 @@ namespace osu.Game.Overlays
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = top_bar_height, Height = top_bar_height,
}, },
new Container
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Top = top_bar_height },
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = colourProvider.Background4,
},
new OnlineViewContainer("Sign in to chat")
{
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{
channelList = new ChannelList channelList = new ChannelList
{ {
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
Width = side_bar_width, Width = side_bar_width,
Padding = new MarginPadding { Top = top_bar_height },
}, },
new Container new Container
{ {
@ -113,17 +129,11 @@ namespace osu.Game.Overlays
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Padding = new MarginPadding Padding = new MarginPadding
{ {
Top = top_bar_height,
Left = side_bar_width, Left = side_bar_width,
Bottom = chat_bar_height, Bottom = chat_bar_height,
}, },
Children = new Drawable[] Children = new Drawable[]
{ {
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = colourProvider.Background4,
},
currentChannelContainer = new Container<DrawableChannel> currentChannelContainer = new Container<DrawableChannel>
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
@ -142,6 +152,10 @@ namespace osu.Game.Overlays
Origin = Anchor.BottomRight, Origin = Anchor.BottomRight,
Padding = new MarginPadding { Left = side_bar_width }, Padding = new MarginPadding { Left = side_bar_width },
}, },
}
}
}
}
}; };
} }