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

Fix keyboard and mouse input not properly getting blocked by GameplayMenuOverlay

Browse Source
This commit is contained in:
Dean Herbert 2017-12-21 13:58:24 +09:00
parent 504ba1d6bc
commit b6fd5b0f17
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Input/Bindings/GlobalKeyBindingInputManager.cs
View File

@ -5,11 +5,12 @@ using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Linq; using System.Linq;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Input;
using osu.Framework.Input.Bindings; using osu.Framework.Input.Bindings;
namespace osu.Game.Input.Bindings namespace osu.Game.Input.Bindings
{ {
public class GlobalKeyBindingInputManager : DatabasedKeyBindingInputManager<GlobalAction> public class GlobalKeyBindingInputManager : DatabasedKeyBindingInputManager<GlobalAction>, IHandleGlobalInput
{ {
private readonly Drawable handler; private readonly Drawable handler;

37
osu.Game/Screens/Play/GameplayMenuOverlay.cs
View File

@ -26,6 +26,8 @@ namespace osu.Game.Screens.Play
protected override bool BlockPassThroughKeyboard => true; protected override bool BlockPassThroughKeyboard => true;
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
public Action OnRetry; public Action OnRetry;
public Action OnQuit; public Action OnQuit;
@ -197,6 +199,7 @@ namespace osu.Game.Screens.Play
} }
private int _selectionIndex = -1; private int _selectionIndex = -1;
private int selectionIndex private int selectionIndex
{ {
get { return _selectionIndex; } get { return _selectionIndex; }
@ -219,26 +222,26 @@ namespace osu.Game.Screens.Play
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{ {
if (args.Repeat) if (!args.Repeat)
return false;
switch (args.Key)
{ {
case Key.Up: switch (args.Key)
if (selectionIndex == -1 || selectionIndex == 0) {
selectionIndex = InternalButtons.Count - 1; case Key.Up:
else if (selectionIndex == -1 || selectionIndex == 0)
selectionIndex--; selectionIndex = InternalButtons.Count - 1;
return true; else
case Key.Down: selectionIndex--;
if (selectionIndex == -1 || selectionIndex == InternalButtons.Count - 1) return true;
selectionIndex = 0; case Key.Down:
else if (selectionIndex == -1 || selectionIndex == InternalButtons.Count - 1)
selectionIndex++; selectionIndex = 0;
return true; else
selectionIndex++;
return true;
}
} }
return false; return base.OnKeyDown(state, args);
} }
private void buttonSelectionChanged(DialogButton button, bool isSelected) private void buttonSelectionChanged(DialogButton button, bool isSelected)