h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-05 17:43:00 +08:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dean Herbert 2017-10-22 17:50:03 +09:00
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 System.Collections.Generic;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Input.Bindings; using osu.Framework.Input.Bindings;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using System.Linq;
namespace osu.Game.Input.Bindings namespace osu.Game.Input.Bindings
{ {
@ -44,11 +45,15 @@ namespace osu.Game.Input.Bindings
private void load(KeyBindingStore keyBindings) private void load(KeyBindingStore keyBindings)
{ {
store = 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 class KeyBindingStore : DatabaseBackedStore
{ {
public event Action KeyBindingChanged;
public KeyBindingStore(Func<OsuDbContext> getContext, RulesetStore rulesets, Storage storage = null) public KeyBindingStore(Func<OsuDbContext> getContext, RulesetStore rulesets, Storage storage = null)
: base(getContext, storage) : base(getContext, storage)
{ {
@ -79,6 +81,8 @@ namespace osu.Game.Input
var context = GetContext(); var context = GetContext();
context.Update(keyBinding); context.Update(keyBinding);
context.SaveChanges(); context.SaveChanges();
KeyBindingChanged?.Invoke();
} }
} }
} }