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

Merge branch 'refs/heads/update-framework' into general-fixes

Browse Source
This commit is contained in:
Thomas Müller 2017-02-17 21:26:39 +01:00
commit 04de28d8b2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Online/Chat/Drawables/ChannelDisplay.cs
View File

@ -38,6 +38,7 @@ namespace osu.Game.Online.Chat.Drawables
},
new ScrollContainer
{
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{
flow = new FlowContainer

3
osu.Game/Overlays/NotificationManager.cs
View File

@ -38,8 +38,9 @@ namespace osu.Game.Overlays
Colour = Color4.Black,
Alpha = 0.6f,
},
scrollContainer = new ScrollContainer()
scrollContainer = new ScrollContainer
{
RelativeSizeAxes = Axes.Both,
Margin = new MarginPadding { Top = Toolbar.Toolbar.HEIGHT },
Children = new[]
{