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

Merge branch 'master' into fix-empty-carousel

Browse Source
This commit is contained in:
Thomas Müller 2017-07-20 21:15:58 +02:00 committed by GitHub
commit e84d8cc020
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Select/BeatmapCarousel.cs
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)

1
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -105,6 +105,7 @@ namespace osu.Game.Screens.Select
if (player != null) return;
Beatmap.Value.Track.Looping = false;
Beatmap.Disabled = true;
LoadComponentAsync(player = new PlayerLoader(new Player()), l => Push(player));
}

5
osu.Game/Screens/Select/SongSelect.cs
View File

@ -109,7 +109,7 @@ namespace osu.Game.Screens.Select
Origin = Anchor.CentreRight,
SelectionChanged = carouselSelectionChanged,
BeatmapsChanged = carouselBeatmapsLoaded,
StartRequested = carouselRaisedStart
StartRequested = carouselRaisedStart,
});
Add(FilterControl = new FilterControl
{
@ -183,6 +183,9 @@ namespace osu.Game.Screens.Select
carousel.Beatmaps = database.GetAllWithChildren<BeatmapSetInfo>(b => !b.DeletePending);
Beatmap.ValueChanged += beatmap_ValueChanged;
Beatmap.DisabledChanged += disabled => carousel.AllowSelection = !disabled;
carousel.AllowSelection = !Beatmap.Disabled;
}
private void carouselBeatmapsLoaded()