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

Tidy up content container specification

Browse Source
This commit is contained in:
Dean Herbert 2021-05-20 14:30:40 +09:00
parent ac8efdeabd
commit 673ca4c2a1
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Overlays/NewsOverlay.cs
View File

@ -16,12 +16,11 @@ namespace osu.Game.Overlays
{
private readonly Bindable<string> article = new Bindable<string>(null);
protected override Container<Drawable> Content => content;
private readonly Container content;
private readonly Container sidebarContainer;
private readonly NewsSidebar sidebar;
private readonly Container content;
private CancellationTokenSource cancellationToken;
private bool displayUpdateRequired = true;
@ -29,7 +28,7 @@ namespace osu.Game.Overlays
public NewsOverlay()
: base(OverlayColourScheme.Purple, false)
{
base.Content.Add(new GridContainer
Child = new GridContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
@ -58,7 +57,7 @@ namespace osu.Game.Overlays
}
}
}
});
};
}
protected override void LoadComplete()
@ -112,16 +111,12 @@ namespace osu.Game.Overlays
protected void LoadDisplay(Drawable display)
{
ScrollFlow.ScrollToStart();
LoadComponentAsync(display, loaded =>
{
Child = loaded;
}, (cancellationToken = new CancellationTokenSource()).Token);
LoadComponentAsync(display, loaded => content.Child = loaded, (cancellationToken = new CancellationTokenSource()).Token);
}
protected override void UpdateAfterChildren()
{
base.UpdateAfterChildren();
sidebarContainer.Height = DrawHeight;
sidebarContainer.Y = Math.Clamp(ScrollFlow.Current - Header.DrawHeight, 0, Math.Max(ScrollFlow.ScrollContent.DrawHeight - DrawHeight - Header.DrawHeight, 0));
}