mirror of
https://github.com/osukey/osukey.git
synced 2025-06-09 21:37:59 +09:00
Merge branch 'master' into scrollable_carousel
This commit is contained in:
commit
7fcd24ab69
@ -73,6 +73,17 @@ namespace osu.Game.Overlays.Music
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void AddBeatmapSet(BeatmapSetInfo beatmapSet)
|
||||||
|
{
|
||||||
|
items.Add(new PlaylistItem(beatmapSet) { OnSelect = itemSelected });
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RemoveBeatmapSet(BeatmapSetInfo beatmapSet)
|
||||||
|
{
|
||||||
|
PlaylistItem itemToRemove = items.Children.FirstOrDefault(item => item.BeatmapSetInfo == beatmapSet);
|
||||||
|
if (itemToRemove != null) items.Remove(itemToRemove);
|
||||||
|
}
|
||||||
|
|
||||||
private class ItemSearchContainer : FillFlowContainer<PlaylistItem>, IHasFilterableChildren
|
private class ItemSearchContainer : FillFlowContainer<PlaylistItem>, IHasFilterableChildren
|
||||||
{
|
{
|
||||||
public string[] FilterTerms => new string[] { };
|
public string[] FilterTerms => new string[] { };
|
||||||
|
@ -80,6 +80,9 @@ namespace osu.Game.Overlays.Music
|
|||||||
|
|
||||||
list.BeatmapSets = BeatmapSets = beatmaps.GetAllWithChildren<BeatmapSetInfo>(b => !b.DeletePending).ToList();
|
list.BeatmapSets = BeatmapSets = beatmaps.GetAllWithChildren<BeatmapSetInfo>(b => !b.DeletePending).ToList();
|
||||||
|
|
||||||
|
beatmaps.BeatmapSetAdded += s => list.AddBeatmapSet(s);
|
||||||
|
beatmaps.BeatmapSetRemoved += s => list.RemoveBeatmapSet(s);
|
||||||
|
|
||||||
beatmapBacking.BindTo(game.Beatmap);
|
beatmapBacking.BindTo(game.Beatmap);
|
||||||
|
|
||||||
filter.Search.OnCommit = (sender, newText) =>
|
filter.Search.OnCommit = (sender, newText) =>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user