diff --git a/osu-framework b/osu-framework index a1a62c14a5..682f078b2e 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit a1a62c14a51654c933c5b077c725d566f167145b +Subproject commit 682f078b2efc82fa19342f499f14c4a8458843d5 diff --git a/osu.Game/Input/GlobalHotkeys.cs b/osu.Game/Input/GlobalHotkeys.cs deleted file mode 100644 index b1b22f7069..0000000000 --- a/osu.Game/Input/GlobalHotkeys.cs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) 2007-2017 ppy Pty Ltd . -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using System; -using osu.Framework.Graphics; -using osu.Framework.Input; - -namespace osu.Game.Input -{ - public class GlobalHotkeys : Drawable - { - public Func Handler; - - public override bool HandleInput => true; - - public GlobalHotkeys() - { - RelativeSizeAxes = Axes.Both; - } - - protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) - { - return Handler(state, args); - } - } -} \ No newline at end of file diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index c9f41de5f2..ccead95ede 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -9,7 +9,6 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Overlays; using osu.Framework.Input; -using osu.Game.Input; using OpenTK.Input; using osu.Framework.Logging; using osu.Game.Graphics.UserInterface.Volume; diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index bd9f087cf7..fd15115fe2 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -284,7 +284,6 @@ -