Merge remote-tracking branch 'upstream/master' into load-optimization

This commit is contained in:
Dean Herbert
2017-11-23 18:44:17 +09:00
19 changed files with 364 additions and 120 deletions

View File

@ -572,7 +572,18 @@ namespace osu.Game.Screens.Select
// Makes sure headers are always _below_ panels,
// and depth flows downward.
panel.Depth = i + (panel is BeatmapSetHeader ? panels.Count : 0);
scrollableContent.Add(panel);
switch (panel.LoadState)
{
case LoadState.NotLoaded:
LoadComponentAsync(panel);
break;
case LoadState.Loading:
break;
default:
scrollableContent.Add(panel);
break;
}
}
}