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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Dean Herbert
2017-03-02 18:06:31 +09:00
committed by GitHub
parent 8b336156f0 ffd65606be
commit 51950eef43
96 changed files with 988 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ using osu.Framework.Input;
using OpenTK.Input;
using System.Collections.Generic;
using osu.Framework.Threading;
using osu.Game.Overlays;
namespace osu.Game.Screens.Select
{
@ -38,6 +39,7 @@ namespace osu.Game.Screens.Select
private CarouselContainer carousel;
private TrackManager trackManager;
private DialogOverlay dialogOverlay;
private static readonly Vector2 wedged_container_size = new Vector2(0.5f, 225);
private BeatmapInfoWedge beatmapInfoWedge;
@ -72,7 +74,7 @@ namespace osu.Game.Screens.Select
}
[BackgroundDependencyLoader(permitNulls: true)]
private void load(BeatmapDatabase beatmaps, AudioManager audio, Framework.Game game,
private void load(BeatmapDatabase beatmaps, AudioManager audio, DialogOverlay dialog, Framework.Game game,
OsuGame osuGame, OsuColour colours)
{
const float carousel_width = 640;
@ -137,7 +139,7 @@ namespace osu.Game.Screens.Select
PreferredPlayMode = playMode.Value
})).LoadAsync(Game, l => Push(player));
}
}
},
};
footer.AddButton(@"mods", colours.Yellow, null);
@ -157,6 +159,7 @@ namespace osu.Game.Screens.Select
database.BeatmapSetRemoved += onBeatmapSetRemoved;
trackManager = audio.Track;
dialogOverlay = dialog;
sampleChangeDifficulty = audio.Sample.Get(@"SongSelect/select-difficulty");
sampleChangeBeatmap = audio.Sample.Get(@"SongSelect/select-expand");
@ -399,12 +402,14 @@ namespace osu.Game.Screens.Select
footer.StartButton.TriggerClick();
return true;
case Key.Delete:
if (Beatmap != null)
if (state.Keyboard.ShiftPressed)
{
Beatmap.Dispose();
database.Delete(Beatmap.BeatmapSetInfo);
if (Beatmap != null)
dialogOverlay?.Push(new BeatmapDeleteDialog(Beatmap));
return true;
}
return true;
break;
}
return base.OnKeyDown(state, args);