1
0
mirror of https://github.com/ppy/osu.git synced 2026-05-19 01:10:05 +08:00

Merge pull request #12316 from peppy/fix-game-mouse-cursor

Fix gameplay mouse cursor being overridden by menu cursor
This commit is contained in:
Dan Balasescu
2021-04-07 20:38:40 +09:00
committed by GitHub
Unverified
+5 -7
View File
@@ -308,17 +308,15 @@ namespace osu.Game
AddInternal(RulesetConfigCache);
MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both };
GlobalInputManager globalInput;
MenuCursorContainer.Child = globalInput = new GlobalInputManager(this)
var globalInput = new GlobalInputManager(this)
{
RelativeSizeAxes = Axes.Both,
Child = content = new OsuTooltipContainer(MenuCursorContainer.Cursor) { RelativeSizeAxes = Axes.Both }
Child = MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both }
};
base.Content.Add(CreateScalingContainer().WithChild(MenuCursorContainer));
MenuCursorContainer.Child = content = new OsuTooltipContainer(MenuCursorContainer.Cursor) { RelativeSizeAxes = Axes.Both };
base.Content.Add(CreateScalingContainer().WithChild(globalInput));
KeyBindingStore.Register(globalInput.GlobalBindings);
dependencies.Cache(globalInput.GlobalBindings);