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

Replace pool/cleanup logic with simplest form possible

Browse Source 
This will temporarily break panels that go off-screen, as they will
disappear immediately
This commit is contained in:
Dean Herbert 2020-10-13 13:51:27 +09:00
parent 06e84c8eb3
commit 29983afcef
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -583,21 +583,31 @@ namespace osu.Game.Screens.Select
displayedRange = newDisplayRange;
// Add those items within the previously found index range that should be displayed.
for (int i = displayedRange.first; i < displayedRange.last; ++i)
var toDisplay = visibleItems.GetRange(displayedRange.first, displayedRange.last - displayedRange.first);
foreach (var panel in scrollableContent.Children)
{
var item = visibleItems[i];
if (toDisplay.Remove(panel.Item))
{
// panel already displayed.
continue;
}
if (scrollableContent.Any(c => c.Item == item)) continue;
Logger.Log($"getting panel for {item} from pool");
var panel = setPool.Get(p => p.Item = item);
panel.Depth = i;
panel.Y = item.CarouselYPosition;
scrollableContent.Add(panel);
// panel displayed but not required
scrollableContent.Remove(panel);
}
// Remove any items which are far out of the visible range.
// Add those items within the previously found index range that should be displayed.
foreach (var item in toDisplay)
{
Logger.Log($"getting panel for {item} from pool");
var panel = setPool.Get(p => p.Item = item);
panel.Depth = item.CarouselYPosition; // todo: i think this is correct
panel.Y = item.CarouselYPosition;
scrollableContent.Add(panel);
}
}
// Finally, if the filtered items have changed, animate drawables to their new locations.