sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 08:20:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add and consume IKeyBindingStore interface

Browse Source
This commit is contained in:
Dean Herbert
2021-01-07 16:38:49 +09:00
parent a9a3a95991
commit 43f417b53a
9 changed files with 80 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
View File

@ -6,7 +6,6 @@ using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Input.Bindings;
using osu.Game.Rulesets;
using System.Linq;
namespace osu.Game.Input.Bindings
{
@ -21,7 +20,8 @@ namespace osu.Game.Input.Bindings
private readonly int? variant;
private KeyBindingStore store;
[Resolved]
private IKeyBindingStore store { get; set; }
public override IEnumerable<KeyBinding> DefaultKeyBindings => ruleset.CreateInstance().GetDefaultKeyBindings(variant ?? 0);
@ -42,12 +42,6 @@ namespace osu.Game.Input.Bindings
throw new InvalidOperationException($"{nameof(variant)} can not be null when a non-null {nameof(ruleset)} is provided.");
}
[BackgroundDependencyLoader]
private void load(KeyBindingStore keyBindings)
{
store = keyBindings;
}
protected override void LoadComplete()
{
base.LoadComplete();
@ -69,7 +63,7 @@ namespace osu.Game.Input.Bindings
// fallback to defaults instead.
KeyBindings = DefaultKeyBindings;
else
KeyBindings = store.Query(ruleset?.ID, variant).ToList();
KeyBindings = store.Query(ruleset?.ID, variant);
}
}
}