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

Revert to using empty container, not null

Browse Source
This commit is contained in:
Dean Herbert 2019-12-27 13:15:55 +09:00
parent 04a4821a9f
commit 9478fe5ec3
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Overlays/OverlayHeader.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using JetBrains.Annotations;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
@ -37,14 +38,12 @@ namespace osu.Game.Overlays
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
FillFlowContainer flow; Add(new FillFlowContainer
Add(flow = new FillFlowContainer
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
Children = new Drawable[] Children = new[]
{ {
background = new Container background = new Container
{ {
@ -95,19 +94,16 @@ namespace osu.Game.Overlays
Padding = new MarginPadding { Left = UserProfileOverlay.CONTENT_X_MARGIN }, Padding = new MarginPadding { Left = UserProfileOverlay.CONTENT_X_MARGIN },
} }
} }
} },
CreateContent()
} }
}); });
var content = CreateContent();
if (content != null)
flow.Add(content);
} }
protected abstract Drawable CreateBackground(); protected abstract Drawable CreateBackground();
protected virtual Drawable CreateContent() => null; [NotNull]
protected virtual Drawable CreateContent() => new Container();
protected abstract ScreenTitle CreateTitle(); protected abstract ScreenTitle CreateTitle();
} }