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

DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay

Browse Source
This commit is contained in:
DrabWeb
2017-02-28 02:09:36 -04:00
parent 50d172be39
commit ce1798b8bc
8 changed files with 38 additions and 24 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;
@ -58,7 +60,7 @@ namespace osu.Game.Screens.Select
[BackgroundDependencyLoader(permitNulls: true)]
private void load(BeatmapDatabase beatmaps, AudioManager audio, Framework.Game game,
OsuGame osuGame, OsuColour colours)
OsuGame osuGame, DialogOverlay dialog, OsuColour colours)
{
const float carousel_width = 640;
const float filter_height = 100;
@ -142,6 +144,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");
@ -383,19 +386,13 @@ namespace osu.Game.Screens.Select
return true;
case Key.Delete:
if (state.Keyboard.ShiftPressed)
{
// TODO: Delete beatmap dialog here
return true;
}
else
{
if (Beatmap != null)
{
Beatmap.Dispose();
database.Delete(Beatmap.BeatmapSetInfo);
}
dialogOverlay.Push(new BeatmapDeleteDialog(Beatmap));
return true;
}
break;
}
return base.OnKeyDown(state, args);