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

Remove GlobalHotkeys

Browse Source
This commit is contained in:
Dean Herbert
2017-08-10 19:52:45 +09:00
parent 641b3bd27e
commit a93a92a2bb
6 changed files with 51 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/OsuGame.cs
View File

@ -29,7 +29,7 @@ using osu.Game.Input;
namespace osu.Game
{
public class OsuGame : OsuGameBase
public class OsuGame : OsuGameBase, IHandleActions<GlobalAction>
{
public Toolbar Toolbar;
@ -168,10 +168,6 @@ namespace osu.Game
volume = new VolumeControl(),
overlayContent = new Container { RelativeSizeAxes = Axes.Both },
new OnScreenDisplay(),
new Input.GlobalHotkeys //exists because UserInputManager is at a level below us.
{
Handler = globalHotkeyPressed
}
});
LoadComponentAsync(screenStack = new Loader(), d =>
@ -251,7 +247,7 @@ namespace osu.Game
Cursor.State = Visibility.Hidden;
}
private bool globalHotkeyPressed(GlobalAction action)
public bool OnPressed(GlobalAction action)
{
if (intro == null) return false;
@ -286,6 +282,8 @@ namespace osu.Game
return false;
}
public bool OnReleased(GlobalAction action) => false;
public event Action<Screen> ScreenChanged;
private Container mainContent;