Stop exposing CarouselItem externally

ppy · Jan 10, 2025 · 4e87467 · 4e87467
1 parent c18df2c
commit 4e87467
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/osu.Game/Screens/SelectV2/BeatmapCarouselV2.cs b/osu.Game/Screens/SelectV2/BeatmapCarouselV2.cs
@@ -60,6 +60,8 @@ protected override Drawable GetDrawableForDisplay(CarouselItem item)
             return drawable;
         }
 
+        protected override CarouselItem CreateCarouselItemForModel(object model) => new BeatmapCarouselItem(model);
+
         private void beatmapSetsChanged(object? beatmaps, NotifyCollectionChangedEventArgs changed)
         {
             // TODO: moving management of BeatmapInfo tracking to BeatmapStore might be something we want to consider.
@@ -70,15 +72,15 @@ private void beatmapSetsChanged(object? beatmaps, NotifyCollectionChangedEventAr
             switch (changed.Action)
             {
                 case NotifyCollectionChangedAction.Add:
-                    Items.AddRange(newBeatmapSets!.SelectMany(s => s.Beatmaps).Select(b => new BeatmapCarouselItem(b)));
+                    Items.AddRange(newBeatmapSets!.SelectMany(s => s.Beatmaps));
                     break;
 
                 case NotifyCollectionChangedAction.Remove:
 
                     foreach (var set in beatmapSetInfos!)
                     {
                         foreach (var beatmap in set.Beatmaps)
-                            Items.RemoveAll(i => i.Model is BeatmapInfo bi && beatmap.Equals(bi));
+                            Items.RemoveAll(i => i is BeatmapInfo bi && beatmap.Equals(bi));
                     }
 
                     break;

diff --git a/osu.Game/Screens/SelectV2/Carousel.cs b/osu.Game/Screens/SelectV2/Carousel.cs
@@ -80,7 +80,7 @@ public abstract partial class Carousel : CompositeDrawable
         /// <remarks>
         /// Note that an <see cref="ICarouselFilter"/> may add new items which are displayed but not tracked in this list.
         /// </remarks>
-        protected readonly BindableList<CarouselItem> Items = new BindableList<CarouselItem>();
+        protected readonly BindableList<object> Items = new BindableList<object>();
 
         /// <summary>
         /// The currently selected model.
@@ -143,6 +143,13 @@ protected Carousel()
         /// <returns>The manifested drawable.</returns>
         protected abstract Drawable GetDrawableForDisplay(CarouselItem item);
 
+        /// <summary>
+        /// Create an internal carousel representation for the provided model object.
+        /// </summary>
+        /// <param name="model">The model.</param>
+        /// <returns>A <see cref="CarouselItem"/> representing the model.</returns>
+        protected abstract CarouselItem CreateCarouselItemForModel(object model);
+
         #region Filtering and display preparation
 
         private Task filterTask = Task.CompletedTask;
@@ -161,7 +168,7 @@ private async Task performFilter()
             }
 
             Stopwatch stopwatch = Stopwatch.StartNew();
-            IEnumerable<CarouselItem> items = new List<CarouselItem>(Items);
+            IEnumerable<CarouselItem> items = new List<CarouselItem>(Items.Select(CreateCarouselItemForModel));
 
             await Task.Run(async () =>
             {