mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 18:42:56 +08:00
Fix potentially missing group headers in beatmap carousel
This commit is contained in:
parent
f4c2d6b1a3
commit
3886e75959
@ -27,6 +27,11 @@ namespace osu.Game.Screens.Select.Carousel
|
|||||||
get
|
get
|
||||||
{
|
{
|
||||||
var drawables = base.Drawables;
|
var drawables = base.Drawables;
|
||||||
|
|
||||||
|
// if we are explicitly not present, don't ever present children.
|
||||||
|
// without this check, children drawables can potentially be presented without their group header.
|
||||||
|
if (DrawableRepresentation.Value?.IsPresent == false) return drawables;
|
||||||
|
|
||||||
foreach (var c in InternalChildren)
|
foreach (var c in InternalChildren)
|
||||||
drawables.AddRange(c.Drawables);
|
drawables.AddRange(c.Drawables);
|
||||||
return drawables;
|
return drawables;
|
||||||
|
@ -24,7 +24,7 @@ namespace osu.Game.Screens.Select.Carousel
|
|||||||
{
|
{
|
||||||
var items = new List<DrawableCarouselItem>();
|
var items = new List<DrawableCarouselItem>();
|
||||||
|
|
||||||
var self = drawableRepresentation.Value;
|
var self = DrawableRepresentation.Value;
|
||||||
if (self?.IsPresent == true) items.Add(self);
|
if (self?.IsPresent == true) items.Add(self);
|
||||||
|
|
||||||
return items;
|
return items;
|
||||||
@ -35,7 +35,7 @@ namespace osu.Game.Screens.Select.Carousel
|
|||||||
|
|
||||||
protected CarouselItem()
|
protected CarouselItem()
|
||||||
{
|
{
|
||||||
drawableRepresentation = new Lazy<DrawableCarouselItem>(CreateDrawableRepresentation);
|
DrawableRepresentation = new Lazy<DrawableCarouselItem>(CreateDrawableRepresentation);
|
||||||
|
|
||||||
Filtered.ValueChanged += v =>
|
Filtered.ValueChanged += v =>
|
||||||
{
|
{
|
||||||
@ -44,13 +44,16 @@ namespace osu.Game.Screens.Select.Carousel
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private readonly Lazy<DrawableCarouselItem> drawableRepresentation;
|
protected readonly Lazy<DrawableCarouselItem> DrawableRepresentation;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Used as a default sort method for <see cref="CarouselItem"/>s of differing types.
|
/// Used as a default sort method for <see cref="CarouselItem"/>s of differing types.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal ulong ChildID;
|
internal ulong ChildID;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Create a fresh drawable version of this item. If you wish to consume the current representation, use <see cref="DrawableRepresentation"/> instead.
|
||||||
|
/// </summary>
|
||||||
protected abstract DrawableCarouselItem CreateDrawableRepresentation();
|
protected abstract DrawableCarouselItem CreateDrawableRepresentation();
|
||||||
|
|
||||||
public virtual void Filter(FilterCriteria criteria)
|
public virtual void Filter(FilterCriteria criteria)
|
||||||
|
Loading…
Reference in New Issue
Block a user