Merge branch 'master' into fix-empty-carousel

This commit is contained in:
Thomas Müller
2017-07-20 21:15:58 +02:00
committed by GitHub
3 changed files with 9 additions and 1 deletions

View File

@ -25,6 +25,8 @@ namespace osu.Game.Screens.Select
{
public BeatmapInfo SelectedBeatmap => selectedPanel?.Beatmap;
public override bool HandleInput => AllowSelection;
public Action BeatmapsChanged;
public IEnumerable<BeatmapSetInfo> Beatmaps
@ -228,6 +230,8 @@ namespace osu.Game.Screens.Select
private ScheduledDelegate filterTask;
public bool AllowSelection = true;
public void Filter(FilterCriteria newCriteria = null, bool debounce = true)
{
if (newCriteria != null)