Fix gameplay mouse cursor being overridden by menu cursor

Closes https://github.com/ppy/osu/issues/12313.
This commit is contained in:
Dean Herbert 2021-04-07 19:00:04 +09:00
parent 10ea575384
commit e7f47c635f

View File

@ -308,17 +308,15 @@ namespace osu.Game
AddInternal(RulesetConfigCache); AddInternal(RulesetConfigCache);
MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both }; var globalInput = new GlobalInputManager(this)
GlobalInputManager globalInput;
MenuCursorContainer.Child = globalInput = new GlobalInputManager(this)
{ {
RelativeSizeAxes = Axes.Both, 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); KeyBindingStore.Register(globalInput.GlobalBindings);
dependencies.Cache(globalInput.GlobalBindings); dependencies.Cache(globalInput.GlobalBindings);