h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 05:52:54 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into song-selet-enumerable

Browse Source
This commit is contained in:
Dan Balasescu 2018-05-31 14:42:58 +09:00 committed by GitHub
commit 76567ae98b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -209,8 +209,11 @@ namespace osu.Game.Screens.Play
{ {
base.Dispose(isDisposing); base.Dispose(isDisposing);
// if the player never got pushed, we should explicitly dispose it. if (isDisposing)
loadTask?.ContinueWith(_ => player.Dispose()); {
// if the player never got pushed, we should explicitly dispose it.
loadTask?.ContinueWith(_ => player.Dispose());
}
} }
private class BeatmapMetadataDisplay : Container private class BeatmapMetadataDisplay : Container

2
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
View File

@ -51,7 +51,7 @@ namespace osu.Game.Screens.Select.Carousel
if (songSelect != null) if (songSelect != null)
{ {
startRequested = songSelect.FinaliseSelection; startRequested = b => songSelect.FinaliseSelection(b);
editRequested = songSelect.Edit; editRequested = songSelect.Edit;
} }

2
osu.Game/Screens/Select/EditSongSelect.cs
View File

@ -7,7 +7,7 @@ namespace osu.Game.Screens.Select
{ {
protected override bool ShowFooter => false; protected override bool ShowFooter => false;
protected override bool OnSelectionFinalised() protected override bool OnStart()
{ {
Exit(); Exit();
return true; return true;

2
osu.Game/Screens/Select/MatchSongSelect.cs
View File

@ -5,7 +5,7 @@ namespace osu.Game.Screens.Select
{ {
public class MatchSongSelect : SongSelect public class MatchSongSelect : SongSelect
{ {
protected override bool OnSelectionFinalised() protected override bool OnStart()
{ {
Schedule(() => Schedule(() =>
{ {

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

@ -137,7 +137,7 @@ namespace osu.Game.Screens.Select
return false; return false;
} }
protected override bool OnSelectionFinalised() protected override bool OnStart()
{ {
if (player != null) return false; if (player != null) return false;

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

@ -222,7 +222,8 @@ namespace osu.Game.Screens.Select
/// Call to make a selection and perform the default action for this SongSelect. /// Call to make a selection and perform the default action for this SongSelect.
/// </summary> /// </summary>
/// <param name="beatmap">An optional beatmap to override the current carousel selection.</param> /// <param name="beatmap">An optional beatmap to override the current carousel selection.</param>
public void FinaliseSelection(BeatmapInfo beatmap = null) /// <param name="performStartAction">Whether to trigger <see cref="OnStart"/>.</param>
public void FinaliseSelection(BeatmapInfo beatmap = null, bool performStartAction = true)
{ {
// if we have a pending filter operation, we want to run it now. // if we have a pending filter operation, we want to run it now.
// it could change selection (ie. if the ruleset has been changed). // it could change selection (ie. if the ruleset has been changed).
@ -238,14 +239,15 @@ namespace osu.Game.Screens.Select
selectionChangedDebounce = null; selectionChangedDebounce = null;
} }
OnSelectionFinalised(); if (performStartAction)
OnStart();
} }
/// <summary> /// <summary>
/// Called when a selection is made. /// Called when a selection is made.
/// </summary> /// </summary>
/// <returns>If a resultant action occurred that takes the user away from SongSelect.</returns> /// <returns>If a resultant action occurred that takes the user away from SongSelect.</returns>
protected abstract bool OnSelectionFinalised(); protected abstract bool OnStart();
private ScheduledDelegate selectionChangedDebounce; private ScheduledDelegate selectionChangedDebounce;
@ -390,7 +392,7 @@ namespace osu.Game.Screens.Select
protected override bool OnExiting(Screen next) protected override bool OnExiting(Screen next)
{ {
FinaliseSelection(); FinaliseSelection(performStartAction: false);
beatmapInfoWedge.State = Visibility.Hidden; beatmapInfoWedge.State = Visibility.Hidden;