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

Fix potentially missing group headers in beatmap carousel

Browse Source
This commit is contained in:
Dean Herbert 2018-04-24 01:52:25 +09:00
parent f4c2d6b1a3
commit 3886e75959
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/Select/Carousel/CarouselGroup.cs
View File

@ -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;

9
osu.Game/Screens/Select/Carousel/CarouselItem.cs
View File

@ -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)