RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GlobalKeyBindingContainer -> GlobalActionContainer 

Consitent with "FrameworkActionContainer".
This commit is contained in:
smoogipoo 2018-01-30 14:54:30 +09:00
parent ef3fb8c05a
commit b4cd8ea716
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Input/Bindings/GlobalKeyBindingContainer.cs → osu.Game/Input/Bindings/GlobalActionContainer.cs
View File

@ -10,11 +10,11 @@
namespace osu.Game.Input.Bindings namespace osu.Game.Input.Bindings
{ {
public class GlobalKeyBindingContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalInput public class GlobalActionContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalInput
{ {
private readonly Drawable handler; private readonly Drawable handler;
public GlobalKeyBindingContainer(OsuGameBase game) public GlobalActionContainer(OsuGameBase game)
{ {
if (game is IKeyBindingHandler<GlobalAction>) if (game is IKeyBindingHandler<GlobalAction>)
handler = game; handler = game;

4
osu.Game/OsuGameBase.cs
View File

@ -212,10 +212,10 @@ protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
GlobalKeyBindingContainer globalBinding; GlobalActionContainer globalBinding;
CursorOverrideContainer = new CursorOverrideContainer { RelativeSizeAxes = Axes.Both }; CursorOverrideContainer = new CursorOverrideContainer { RelativeSizeAxes = Axes.Both };
CursorOverrideContainer.Child = globalBinding = new GlobalKeyBindingContainer(this) CursorOverrideContainer.Child = globalBinding = new GlobalActionContainer(this)
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Child = content = new OsuTooltipContainer(CursorOverrideContainer.Cursor) { RelativeSizeAxes = Axes.Both　} Child = content = new OsuTooltipContainer(CursorOverrideContainer.Cursor) { RelativeSizeAxes = Axes.Both　}

6
osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
View File

@ -12,7 +12,7 @@ public class GlobalKeyBindingsSection : SettingsSection
public override FontAwesome Icon => FontAwesome.fa_osu_hot; public override FontAwesome Icon => FontAwesome.fa_osu_hot;
public override string Header => "Global"; public override string Header => "Global";
public GlobalKeyBindingsSection(GlobalKeyBindingContainer manager) public GlobalKeyBindingsSection(GlobalActionContainer manager)
{ {
Add(new DefaultBindingsSubsection(manager)); Add(new DefaultBindingsSubsection(manager));
Add(new InGameKeyBindingsSubsection(manager)); Add(new InGameKeyBindingsSubsection(manager));
@ -23,7 +23,7 @@ private class DefaultBindingsSubsection : KeyBindingsSubsection
{ {
protected override string Header => string.Empty; protected override string Header => string.Empty;
public DefaultBindingsSubsection(GlobalKeyBindingContainer manager) public DefaultBindingsSubsection(GlobalActionContainer manager)
: base(null) : base(null)
{ {
Defaults = manager.GlobalKeyBindings; Defaults = manager.GlobalKeyBindings;
@ -34,7 +34,7 @@ private class InGameKeyBindingsSubsection : KeyBindingsSubsection
{ {
protected override string Header => "In Game"; protected override string Header => "In Game";
public InGameKeyBindingsSubsection(GlobalKeyBindingContainer manager) : base(null) public InGameKeyBindingsSubsection(GlobalActionContainer manager) : base(null)
{ {
Defaults = manager.InGameKeyBindings; Defaults = manager.InGameKeyBindings;
} }

2
osu.Game/Overlays/KeyBindingOverlay.cs
View File

@ -15,7 +15,7 @@ public class KeyBindingOverlay : SettingsOverlay
protected override Drawable CreateHeader() => new SettingsHeader("key configuration", "Customise your keys!"); protected override Drawable CreateHeader() => new SettingsHeader("key configuration", "Customise your keys!");
[BackgroundDependencyLoader(permitNulls: true)] [BackgroundDependencyLoader(permitNulls: true)]
private void load(RulesetStore rulesets, GlobalKeyBindingContainer global) private void load(RulesetStore rulesets, GlobalActionContainer global)
{ {
AddSection(new GlobalKeyBindingsSection(global)); AddSection(new GlobalKeyBindingsSection(global));

2
osu.Game/osu.Game.csproj
View File

@ -447,7 +447,7 @@
<Compile Include="Graphics\UserInterface\Volume\VolumeMeter.cs" /> <Compile Include="Graphics\UserInterface\Volume\VolumeMeter.cs" />
<Compile Include="Input\Bindings\DatabasedKeyBinding.cs" /> <Compile Include="Input\Bindings\DatabasedKeyBinding.cs" />
<Compile Include="Input\Bindings\DatabasedKeyBindingContainer.cs" /> <Compile Include="Input\Bindings\DatabasedKeyBindingContainer.cs" />
<Compile Include="Input\Bindings\GlobalKeyBindingContainer.cs" /> <Compile Include="Input\Bindings\GlobalActionContainer.cs" />
<Compile Include="Input\Handlers\ReplayInputHandler.cs" /> <Compile Include="Input\Handlers\ReplayInputHandler.cs" />
<Compile Include="Input\KeyBindingStore.cs" /> <Compile Include="Input\KeyBindingStore.cs" />
<Compile Include="IO\FileInfo.cs" /> <Compile Include="IO\FileInfo.cs" />