sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into songselect-preview-fix

Browse Source
This commit is contained in:
Dean Herbert
2017-07-18 13:05:03 +09:00
committed by GitHub
parent a399b18837 406cf9d0d4
commit b5035ec245
292 changed files with 5534 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,11 +154,11 @@ namespace osu.Game.Screens.Select
}
[BackgroundDependencyLoader(permitNulls: true)]
private void load(BeatmapDatabase beatmaps, AudioManager audio, DialogOverlay dialog, OsuGame osu, OsuColour colours)
private void load(BeatmapDatabase beatmaps, AudioManager audio, DialogOverlay dialog, OsuGame osu, OsuColour colours, UserInputManager input)
{
if (Footer != null)
{
Footer.AddButton(@"random", colours.Green, SelectRandom, Key.F2);
Footer.AddButton(@"random", colours.Green, () => triggerRandom(input), Key.F2);
Footer.AddButton(@"options", colours.Blue, BeatmapOptions.ToggleVisibility, Key.F3);
BeatmapOptions.AddButton(@"Delete", @"Beatmap", FontAwesome.fa_trash, colours.Pink, promptDelete, Key.Number4, float.MaxValue);
@ -209,7 +209,13 @@ namespace osu.Game.Screens.Select
OnSelected();
}
public void SelectRandom() => carousel.SelectRandom();
private void triggerRandom(UserInputManager input)
{
if (input.CurrentState.Keyboard.ShiftPressed)
carousel.SelectPreviousRandom();
else
carousel.SelectNextRandom();
}
protected abstract void OnSelected();
@ -275,10 +281,13 @@ namespace osu.Game.Screens.Select
{
base.Dispose(isDisposing);
database.BeatmapSetAdded -= onBeatmapSetAdded;
database.BeatmapSetRemoved -= onBeatmapSetRemoved;
if (database != null)
{
database.BeatmapSetAdded -= onBeatmapSetAdded;
database.BeatmapSetRemoved -= onBeatmapSetRemoved;
}
initialAddSetsTask.Cancel();
initialAddSetsTask?.Cancel();
}
private void changeBackground(WorkingBeatmap beatmap)