From 647c83e6c858c3a11e74717f8c5af754b248482a Mon Sep 17 00:00:00 2001 From: Andrei Zavatski Date: Thu, 26 Dec 2019 21:21:15 +0300 Subject: [PATCH] Add ability to not create content for headers Rather than creating an empty container --- osu.Game/Overlays/Changelog/ChangelogHeader.cs | 2 +- osu.Game/Overlays/News/NewsHeader.cs | 2 -- osu.Game/Overlays/OverlayHeader.cs | 16 ++++++++++------ osu.Game/Overlays/Profile/ProfileHeader.cs | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs index 18dcdf721c..c6fedc0032 100644 --- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs +++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs @@ -75,7 +75,7 @@ namespace osu.Game.Overlays.Changelog protected override Drawable CreateBackground() => new HeaderBackground(); - protected override Drawable CreateContent() => new Container + protected override Drawable CreateContent => new Container { RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs index 0f73663605..6e17303a9d 100644 --- a/osu.Game/Overlays/News/NewsHeader.cs +++ b/osu.Game/Overlays/News/NewsHeader.cs @@ -63,8 +63,6 @@ namespace osu.Game.Overlays.News protected override Drawable CreateBackground() => new NewsHeaderBackground(); - protected override Drawable CreateContent() => new Container(); - protected override ScreenTitle CreateTitle() => title = new NewsHeaderTitle(); private class NewsHeaderBackground : Sprite diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs index 2e032db2ba..ed27bf7048 100644 --- a/osu.Game/Overlays/OverlayHeader.cs +++ b/osu.Game/Overlays/OverlayHeader.cs @@ -19,7 +19,7 @@ namespace osu.Game.Overlays RelativeSizeAxes = Axes.X; AutoSizeAxes = Axes.Y; - Children = new Drawable[] + AddRange(new[] { new Container { @@ -50,20 +50,24 @@ namespace osu.Game.Overlays Padding = new MarginPadding { Left = UserProfileOverlay.CONTENT_X_MARGIN } } } - }, - new Container + } + }); + + if (CreateContent != null) + { + Add(new Container { Margin = new MarginPadding { Top = cover_height }, RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, - Child = CreateContent() - } + Child = CreateContent + }); }; } protected abstract Drawable CreateBackground(); - protected abstract Drawable CreateContent(); + protected virtual Drawable CreateContent => null; protected abstract ScreenTitle CreateTitle(); } diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs index 76613c156d..454ac72a7b 100644 --- a/osu.Game/Overlays/Profile/ProfileHeader.cs +++ b/osu.Game/Overlays/Profile/ProfileHeader.cs @@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Profile } }; - protected override Drawable CreateContent() => new FillFlowContainer + protected override Drawable CreateContent => new FillFlowContainer { RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y,