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

Pass input state in OnSelected.

Browse Source
This commit is contained in:
Huo Yaoyuan 2017-08-04 00:09:41 +08:00
parent df3f75b842
commit 44fd0eb78b
4 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,14 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Input;
namespace osu.Game.Screens.Select
{
public class EditSongSelect : SongSelect
{
protected override bool ShowFooter => false;
protected override void OnSelected() => Exit();
protected override void OnSelected(InputState state) => Exit();
}
}

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

@ -1,10 +1,12 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Input;
namespace osu.Game.Screens.Select
{
public class MatchSongSelect : SongSelect
{
protected override void OnSelected() => Exit();
protected override void OnSelected(InputState state) => Exit();
}
}

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

@ -25,7 +25,6 @@ namespace osu.Game.Screens.Select
private readonly ModSelectOverlay modSelect;
private readonly BeatmapDetailArea beatmapDetails;
private IEnumerable<Mod> originalMods;
private bool controlPressed;
public PlaySongSelect()
{
@ -109,24 +108,12 @@ namespace osu.Game.Screens.Select
return false;
}
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{
controlPressed = state.Keyboard.ControlPressed;
return base.OnKeyDown(state, args);
}
protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
{
controlPressed = state.Keyboard.ControlPressed;
return base.OnKeyUp(state, args);
}
protected override void OnSelected()
protected override void OnSelected(InputState state)
{
if (player != null) return;
originalMods = modSelect.SelectedMods.Value;
if (controlPressed)
if (state?.Keyboard.ControlPressed == true)
if (findAutoMod(originalMods) == null)
{
var auto = findAutoMod(Ruleset.Value.CreateInstance().GetModsFor(ModType.Special));

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

@ -106,7 +106,7 @@ namespace osu.Game.Screens.Select
Origin = Anchor.CentreRight,
SelectionChanged = carouselSelectionChanged,
BeatmapsChanged = carouselBeatmapsLoaded,
StartRequested = carouselRaisedStart,
StartRequested = () => carouselRaisedStart(),
});
Add(FilterControl = new FilterControl
{
@ -143,7 +143,7 @@ namespace osu.Game.Screens.Select
Add(Footer = new Footer
{
OnBack = Exit,
OnStart = carouselRaisedStart,
OnStart = () => carouselRaisedStart(),
});
FooterPanels.Add(BeatmapOptions = new BeatmapOptionsOverlay());
@ -193,7 +193,7 @@ namespace osu.Game.Screens.Select
carousel.SelectNext();
}
private void carouselRaisedStart()
private void carouselRaisedStart(InputState state = null)
{
// if we have a pending filter operation, we want to run it now.
// it could change selection (ie. if the ruleset has been changed).
@ -206,7 +206,7 @@ namespace osu.Game.Screens.Select
selectionChangedDebounce = null;
}
OnSelected();
OnSelected(state);
}
private ScheduledDelegate selectionChangedDebounce;
@ -270,7 +270,7 @@ namespace osu.Game.Screens.Select
carousel.SelectNextRandom();
}
protected abstract void OnSelected();
protected abstract void OnSelected(InputState state);
private void filterChanged(FilterCriteria criteria, bool debounce = true)
{
@ -393,7 +393,7 @@ namespace osu.Game.Screens.Select
{
case Key.KeypadEnter:
case Key.Enter:
carouselRaisedStart();
carouselRaisedStart(state);
return true;
case Key.Delete:
if (state.Keyboard.ShiftPressed)