sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 17:37:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
commit e667b1fad0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/OsuGameBase.cs
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);