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

Code review fixes

Browse Source
This commit is contained in:
Dean Herbert
2017-08-16 17:34:49 +09:00
parent 54698f2d8f
commit 3df51540e1
9 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ namespace osu.Game.Input.Bindings
private KeyBindingStore store;
public override IEnumerable<KeyBinding> DefaultMappings => ruleset.CreateInstance().GetDefaultKeyBindings();
public override IEnumerable<KeyBinding> DefaultKeyBindings => ruleset.CreateInstance().GetDefaultKeyBindings();
/// <summary>
/// Create a new instance.

6
osu.Game/Input/Bindings/GlobalBindingInputManager.cs → osu.Game/Input/Bindings/GlobalKeyBindingInputManager.cs
View File

@ -11,17 +11,17 @@ using osu.Framework.Input.Bindings;
namespace osu.Game.Input.Bindings
{
public class GlobalBindingInputManager : DatabasedKeyBindingInputManager<GlobalAction>
public class GlobalKeyBindingInputManager : DatabasedKeyBindingInputManager<GlobalAction>
{
private readonly Drawable handler;
public GlobalBindingInputManager(OsuGameBase game)
public GlobalKeyBindingInputManager(OsuGameBase game)
{
if (game is IKeyBindingHandler<GlobalAction>)
handler = game;
}
public override IEnumerable<KeyBinding> DefaultMappings => new[]
public override IEnumerable<KeyBinding> DefaultKeyBindings => new[]
{
new KeyBinding(Key.F8, GlobalAction.ToggleChat),
new KeyBinding(Key.F9, GlobalAction.ToggleSocial),

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

@ -26,7 +26,7 @@ namespace osu.Game.Input
}
}
public void Register(KeyBindingInputManager manager) => insertDefaults(manager.DefaultMappings);
public void Register(KeyBindingInputManager manager) => insertDefaults(manager.DefaultKeyBindings);
protected override int StoreVersion => 3;
@ -51,9 +51,7 @@ namespace osu.Game.Input
protected override void Prepare(bool reset = false)
{
if (reset)
{
Connection.DropTable<DatabasedKeyBinding>();
}
Connection.CreateTable<DatabasedKeyBinding>();
}
@ -90,9 +88,6 @@ namespace osu.Game.Input
public IEnumerable<KeyBinding> Query(int? rulesetId = null, int? variant = null) =>
Query<DatabasedKeyBinding>(b => b.RulesetID == rulesetId && b.Variant == variant);
public void Update(KeyBinding keyBinding)
{
Connection.Update(keyBinding);
}
public void Update(KeyBinding keyBinding) => Connection.Update(keyBinding);
}
}