h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-27 04:42:55 +08:00
Code Issues Releases Wiki Activity

Expose the global binding container to OsuGameTestScene

Browse Source
This commit is contained in:
Salman Ahmed 2020-09-04 10:23:06 +03:00
parent 001509df55
commit 4d9a06bde9
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
View File

@ -14,6 +14,7 @@ using osu.Framework.Testing;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Input.Bindings;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Rulesets; using osu.Game.Rulesets;
@ -109,6 +110,8 @@ namespace osu.Game.Tests.Visual.Navigation
public new OsuConfigManager LocalConfig => base.LocalConfig; public new OsuConfigManager LocalConfig => base.LocalConfig;
public new GlobalActionContainer GlobalBinding => base.GlobalBinding;
public new Bindable<WorkingBeatmap> Beatmap => base.Beatmap; public new Bindable<WorkingBeatmap> Beatmap => base.Beatmap;
public new Bindable<RulesetInfo> Ruleset => base.Ruleset; public new Bindable<RulesetInfo> Ruleset => base.Ruleset;

10
osu.Game/OsuGameBase.cs
View File

@ -64,6 +64,8 @@ namespace osu.Game
protected FileStore FileStore; protected FileStore FileStore;
protected GlobalActionContainer GlobalBinding;
protected KeyBindingStore KeyBindingStore; protected KeyBindingStore KeyBindingStore;
protected SettingsStore SettingsStore; protected SettingsStore SettingsStore;
@ -250,10 +252,8 @@ namespace osu.Game
AddInternal(apiAccess); AddInternal(apiAccess);
AddInternal(RulesetConfigCache); AddInternal(RulesetConfigCache);
GlobalActionContainer globalBinding;
MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both }; MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both };
MenuCursorContainer.Child = globalBinding = new GlobalActionContainer(this) MenuCursorContainer.Child = GlobalBinding = new GlobalActionContainer(this)
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Child = content = new OsuTooltipContainer(MenuCursorContainer.Cursor) { RelativeSizeAxes = Axes.Both } Child = content = new OsuTooltipContainer(MenuCursorContainer.Cursor) { RelativeSizeAxes = Axes.Both }
@ -261,8 +261,8 @@ namespace osu.Game
base.Content.Add(CreateScalingContainer().WithChild(MenuCursorContainer)); base.Content.Add(CreateScalingContainer().WithChild(MenuCursorContainer));
KeyBindingStore.Register(globalBinding); KeyBindingStore.Register(GlobalBinding);
dependencies.Cache(globalBinding); dependencies.Cache(GlobalBinding);
PreviewTrackManager previewTrackManager; PreviewTrackManager previewTrackManager;
dependencies.Cache(previewTrackManager = new PreviewTrackManager()); dependencies.Cache(previewTrackManager = new PreviewTrackManager());