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

Merge remote-tracking branch 'upstream/master' into import-test-fixes

This commit is contained in:
Dean Herbert 2017-10-22 17:50:03 +09:00
parent 7cb893ea21 f86a13ef61
commit 7ba22f0028
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Input/Bindings/DatabasedKeyBindingInputManager.cs
View File

@ -6,6 +6,7 @@
using osu.Framework.Allocation;
using osu.Framework.Input.Bindings;
using osu.Game.Rulesets;
using System.Linq;
namespace osu.Game.Input.Bindings
{
@ -44,11 +45,15 @@ protected DatabasedKeyBindingInputManager(RulesetInfo ruleset = null, int? varia
private void load(KeyBindingStore keyBindings)
{
store = keyBindings;
store.KeyBindingChanged += ReloadMappings;
}
protected override void ReloadMappings()
protected override void Dispose(bool isDisposing)
{
KeyBindings = store.Query(ruleset?.ID, variant);
base.Dispose(isDisposing);
store.KeyBindingChanged -= ReloadMappings;
}
protected override void ReloadMappings() => KeyBindings = store.Query(ruleset?.ID, variant).ToList();
}
}

4
osu.Game/Input/KeyBindingStore.cs
View File

@ -15,6 +15,8 @@ namespace osu.Game.Input
{
public class KeyBindingStore : DatabaseBackedStore
{
public event Action KeyBindingChanged;
public KeyBindingStore(Func<OsuDbContext> getContext, RulesetStore rulesets, Storage storage = null)
: base(getContext, storage)
{
@ -79,6 +81,8 @@ public void Update(KeyBinding keyBinding)
var context = GetContext();
context.Update(keyBinding);
context.SaveChanges();
KeyBindingChanged?.Invoke();
}
}
}