mirror of
https://github.com/ppy/osu.git
synced 2024-09-21 22:07:25 +08:00
Merge pull request #25104 from bdach/make-realm-key-binding-action-suck-less
Refactor key binding panel for easier usage
This commit is contained in:
commit
7c36848eb1
48
osu.Game.Tests/Input/RealmKeyBindingTest.cs
Normal file
48
osu.Game.Tests/Input/RealmKeyBindingTest.cs
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using NUnit.Framework;
|
||||||
|
using osu.Framework.Allocation;
|
||||||
|
using osu.Framework.Input.Bindings;
|
||||||
|
using osu.Framework.Testing;
|
||||||
|
using osu.Game.Input.Bindings;
|
||||||
|
using osu.Game.Rulesets;
|
||||||
|
using osu.Game.Rulesets.Catch;
|
||||||
|
using osu.Game.Rulesets.Mania;
|
||||||
|
using osu.Game.Rulesets.Osu;
|
||||||
|
using osu.Game.Rulesets.Taiko;
|
||||||
|
using osu.Game.Tests.Visual;
|
||||||
|
using osuTK.Input;
|
||||||
|
|
||||||
|
namespace osu.Game.Tests.Input
|
||||||
|
{
|
||||||
|
[HeadlessTest]
|
||||||
|
public partial class RealmKeyBindingTest : OsuTestScene
|
||||||
|
{
|
||||||
|
[Resolved]
|
||||||
|
private RulesetStore rulesets { get; set; } = null!;
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestUnmapGlobalAction()
|
||||||
|
{
|
||||||
|
var keyBinding = new RealmKeyBinding(GlobalAction.ToggleReplaySettings, KeyCombination.FromKey(Key.Z));
|
||||||
|
|
||||||
|
AddAssert("action is integer", () => keyBinding.Action, () => Is.EqualTo((int)GlobalAction.ToggleReplaySettings));
|
||||||
|
AddAssert("action unmaps correctly", () => keyBinding.GetAction(rulesets), () => Is.EqualTo(GlobalAction.ToggleReplaySettings));
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestCase(typeof(OsuRuleset), OsuAction.Smoke, null)]
|
||||||
|
[TestCase(typeof(TaikoRuleset), TaikoAction.LeftCentre, null)]
|
||||||
|
[TestCase(typeof(CatchRuleset), CatchAction.MoveRight, null)]
|
||||||
|
[TestCase(typeof(ManiaRuleset), ManiaAction.Key7, 7)]
|
||||||
|
public void TestUnmapRulesetActions(Type rulesetType, object action, int? variant)
|
||||||
|
{
|
||||||
|
string rulesetName = ((Ruleset)Activator.CreateInstance(rulesetType)!).ShortName;
|
||||||
|
var keyBinding = new RealmKeyBinding(action, KeyCombination.FromKey(Key.Z), rulesetName, variant);
|
||||||
|
|
||||||
|
AddAssert("action is integer", () => keyBinding.Action, () => Is.EqualTo((int)action));
|
||||||
|
AddAssert("action unmaps correctly", () => keyBinding.GetAction(rulesets), () => Is.EqualTo(action));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,6 +1,7 @@
|
|||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
// See the LICENCE file in the repository root for full licence text.
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using osu.Framework.Input;
|
using osu.Framework.Input;
|
||||||
@ -13,6 +14,8 @@ namespace osu.Game.Input.Bindings
|
|||||||
{
|
{
|
||||||
public partial class GlobalActionContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalKeyboardInput, IKeyBindingHandler<GlobalAction>
|
public partial class GlobalActionContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalKeyboardInput, IKeyBindingHandler<GlobalAction>
|
||||||
{
|
{
|
||||||
|
protected override bool Prioritised => true;
|
||||||
|
|
||||||
private readonly IKeyBindingHandler<GlobalAction>? handler;
|
private readonly IKeyBindingHandler<GlobalAction>? handler;
|
||||||
|
|
||||||
public GlobalActionContainer(OsuGameBase? game)
|
public GlobalActionContainer(OsuGameBase? game)
|
||||||
@ -22,22 +25,62 @@ namespace osu.Game.Input.Bindings
|
|||||||
handler = h;
|
handler = h;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override bool Prioritised => true;
|
/// <summary>
|
||||||
|
/// All default key bindings across all categories, ordered with highest priority first.
|
||||||
// IMPORTANT: Take care when changing order of the items in the enumerable.
|
/// </summary>
|
||||||
// It is used to decide the order of precedence, with the earlier items having higher precedence.
|
/// <remarks>
|
||||||
public override IEnumerable<IKeyBinding> DefaultKeyBindings => GlobalKeyBindings
|
/// IMPORTANT: Take care when changing order of the items in the enumerable.
|
||||||
.Concat(EditorKeyBindings)
|
/// It is used to decide the order of precedence, with the earlier items having higher precedence.
|
||||||
.Concat(InGameKeyBindings)
|
/// </remarks>
|
||||||
.Concat(ReplayKeyBindings)
|
public override IEnumerable<IKeyBinding> DefaultKeyBindings => globalKeyBindings
|
||||||
.Concat(SongSelectKeyBindings)
|
.Concat(editorKeyBindings)
|
||||||
.Concat(AudioControlKeyBindings)
|
.Concat(inGameKeyBindings)
|
||||||
|
.Concat(replayKeyBindings)
|
||||||
|
.Concat(songSelectKeyBindings)
|
||||||
|
.Concat(audioControlKeyBindings)
|
||||||
// Overlay bindings may conflict with more local cases like the editor so they are checked last.
|
// Overlay bindings may conflict with more local cases like the editor so they are checked last.
|
||||||
// It has generally been agreed on that local screens like the editor should have priority,
|
// It has generally been agreed on that local screens like the editor should have priority,
|
||||||
// based on such usages potentially requiring a lot more key bindings that may be "shared" with global ones.
|
// based on such usages potentially requiring a lot more key bindings that may be "shared" with global ones.
|
||||||
.Concat(OverlayKeyBindings);
|
.Concat(overlayKeyBindings);
|
||||||
|
|
||||||
public IEnumerable<KeyBinding> GlobalKeyBindings => new[]
|
public static IEnumerable<KeyBinding> GetDefaultBindingsFor(GlobalActionCategory category)
|
||||||
|
{
|
||||||
|
switch (category)
|
||||||
|
{
|
||||||
|
case GlobalActionCategory.General:
|
||||||
|
return globalKeyBindings;
|
||||||
|
|
||||||
|
case GlobalActionCategory.Editor:
|
||||||
|
return editorKeyBindings;
|
||||||
|
|
||||||
|
case GlobalActionCategory.InGame:
|
||||||
|
return inGameKeyBindings;
|
||||||
|
|
||||||
|
case GlobalActionCategory.Replay:
|
||||||
|
return replayKeyBindings;
|
||||||
|
|
||||||
|
case GlobalActionCategory.SongSelect:
|
||||||
|
return songSelectKeyBindings;
|
||||||
|
|
||||||
|
case GlobalActionCategory.AudioControl:
|
||||||
|
return audioControlKeyBindings;
|
||||||
|
|
||||||
|
case GlobalActionCategory.Overlays:
|
||||||
|
return overlayKeyBindings;
|
||||||
|
|
||||||
|
default:
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(category), category, $"Unexpected {nameof(GlobalActionCategory)}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IEnumerable<GlobalAction> GetGlobalActionsFor(GlobalActionCategory category)
|
||||||
|
=> GetDefaultBindingsFor(category).Select(binding => binding.Action).Cast<GlobalAction>().Distinct();
|
||||||
|
|
||||||
|
public bool OnPressed(KeyBindingPressEvent<GlobalAction> e) => handler?.OnPressed(e) == true;
|
||||||
|
|
||||||
|
public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e) => handler?.OnReleased(e);
|
||||||
|
|
||||||
|
private static IEnumerable<KeyBinding> globalKeyBindings => new[]
|
||||||
{
|
{
|
||||||
new KeyBinding(InputKey.Up, GlobalAction.SelectPrevious),
|
new KeyBinding(InputKey.Up, GlobalAction.SelectPrevious),
|
||||||
new KeyBinding(InputKey.Down, GlobalAction.SelectNext),
|
new KeyBinding(InputKey.Down, GlobalAction.SelectNext),
|
||||||
@ -67,7 +110,7 @@ namespace osu.Game.Input.Bindings
|
|||||||
new KeyBinding(InputKey.F12, GlobalAction.TakeScreenshot),
|
new KeyBinding(InputKey.F12, GlobalAction.TakeScreenshot),
|
||||||
};
|
};
|
||||||
|
|
||||||
public IEnumerable<KeyBinding> OverlayKeyBindings => new[]
|
private static IEnumerable<KeyBinding> overlayKeyBindings => new[]
|
||||||
{
|
{
|
||||||
new KeyBinding(InputKey.F8, GlobalAction.ToggleChat),
|
new KeyBinding(InputKey.F8, GlobalAction.ToggleChat),
|
||||||
new KeyBinding(InputKey.F6, GlobalAction.ToggleNowPlaying),
|
new KeyBinding(InputKey.F6, GlobalAction.ToggleNowPlaying),
|
||||||
@ -77,7 +120,7 @@ namespace osu.Game.Input.Bindings
|
|||||||
new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
|
new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
|
||||||
};
|
};
|
||||||
|
|
||||||
public IEnumerable<KeyBinding> EditorKeyBindings => new[]
|
private static IEnumerable<KeyBinding> editorKeyBindings => new[]
|
||||||
{
|
{
|
||||||
new KeyBinding(new[] { InputKey.F1 }, GlobalAction.EditorComposeMode),
|
new KeyBinding(new[] { InputKey.F1 }, GlobalAction.EditorComposeMode),
|
||||||
new KeyBinding(new[] { InputKey.F2 }, GlobalAction.EditorDesignMode),
|
new KeyBinding(new[] { InputKey.F2 }, GlobalAction.EditorDesignMode),
|
||||||
@ -101,7 +144,7 @@ namespace osu.Game.Input.Bindings
|
|||||||
new KeyBinding(new[] { InputKey.Control, InputKey.R }, GlobalAction.EditorToggleRotateControl),
|
new KeyBinding(new[] { InputKey.Control, InputKey.R }, GlobalAction.EditorToggleRotateControl),
|
||||||
};
|
};
|
||||||
|
|
||||||
public IEnumerable<KeyBinding> InGameKeyBindings => new[]
|
private static IEnumerable<KeyBinding> inGameKeyBindings => new[]
|
||||||
{
|
{
|
||||||
new KeyBinding(InputKey.Space, GlobalAction.SkipCutscene),
|
new KeyBinding(InputKey.Space, GlobalAction.SkipCutscene),
|
||||||
new KeyBinding(InputKey.ExtraMouseButton2, GlobalAction.SkipCutscene),
|
new KeyBinding(InputKey.ExtraMouseButton2, GlobalAction.SkipCutscene),
|
||||||
@ -118,7 +161,7 @@ namespace osu.Game.Input.Bindings
|
|||||||
new KeyBinding(InputKey.F2, GlobalAction.ExportReplay),
|
new KeyBinding(InputKey.F2, GlobalAction.ExportReplay),
|
||||||
};
|
};
|
||||||
|
|
||||||
public IEnumerable<KeyBinding> ReplayKeyBindings => new[]
|
private static IEnumerable<KeyBinding> replayKeyBindings => new[]
|
||||||
{
|
{
|
||||||
new KeyBinding(InputKey.Space, GlobalAction.TogglePauseReplay),
|
new KeyBinding(InputKey.Space, GlobalAction.TogglePauseReplay),
|
||||||
new KeyBinding(InputKey.MouseMiddle, GlobalAction.TogglePauseReplay),
|
new KeyBinding(InputKey.MouseMiddle, GlobalAction.TogglePauseReplay),
|
||||||
@ -127,7 +170,7 @@ namespace osu.Game.Input.Bindings
|
|||||||
new KeyBinding(new[] { InputKey.Control, InputKey.H }, GlobalAction.ToggleReplaySettings),
|
new KeyBinding(new[] { InputKey.Control, InputKey.H }, GlobalAction.ToggleReplaySettings),
|
||||||
};
|
};
|
||||||
|
|
||||||
public IEnumerable<KeyBinding> SongSelectKeyBindings => new[]
|
private static IEnumerable<KeyBinding> songSelectKeyBindings => new[]
|
||||||
{
|
{
|
||||||
new KeyBinding(InputKey.F1, GlobalAction.ToggleModSelection),
|
new KeyBinding(InputKey.F1, GlobalAction.ToggleModSelection),
|
||||||
new KeyBinding(InputKey.F2, GlobalAction.SelectNextRandom),
|
new KeyBinding(InputKey.F2, GlobalAction.SelectNextRandom),
|
||||||
@ -136,7 +179,7 @@ namespace osu.Game.Input.Bindings
|
|||||||
new KeyBinding(InputKey.BackSpace, GlobalAction.DeselectAllMods),
|
new KeyBinding(InputKey.BackSpace, GlobalAction.DeselectAllMods),
|
||||||
};
|
};
|
||||||
|
|
||||||
public IEnumerable<KeyBinding> AudioControlKeyBindings => new[]
|
private static IEnumerable<KeyBinding> audioControlKeyBindings => new[]
|
||||||
{
|
{
|
||||||
new KeyBinding(new[] { InputKey.Alt, InputKey.Up }, GlobalAction.IncreaseVolume),
|
new KeyBinding(new[] { InputKey.Alt, InputKey.Up }, GlobalAction.IncreaseVolume),
|
||||||
new KeyBinding(new[] { InputKey.Alt, InputKey.Down }, GlobalAction.DecreaseVolume),
|
new KeyBinding(new[] { InputKey.Alt, InputKey.Down }, GlobalAction.DecreaseVolume),
|
||||||
@ -153,10 +196,6 @@ namespace osu.Game.Input.Bindings
|
|||||||
new KeyBinding(InputKey.PlayPause, GlobalAction.MusicPlay),
|
new KeyBinding(InputKey.PlayPause, GlobalAction.MusicPlay),
|
||||||
new KeyBinding(InputKey.F3, GlobalAction.MusicPlay)
|
new KeyBinding(InputKey.F3, GlobalAction.MusicPlay)
|
||||||
};
|
};
|
||||||
|
|
||||||
public bool OnPressed(KeyBindingPressEvent<GlobalAction> e) => handler?.OnPressed(e) == true;
|
|
||||||
|
|
||||||
public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e) => handler?.OnReleased(e);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum GlobalAction
|
public enum GlobalAction
|
||||||
@ -365,4 +404,15 @@ namespace osu.Game.Input.Bindings
|
|||||||
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorToggleRotateControl))]
|
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.EditorToggleRotateControl))]
|
||||||
EditorToggleRotateControl,
|
EditorToggleRotateControl,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public enum GlobalActionCategory
|
||||||
|
{
|
||||||
|
General,
|
||||||
|
Editor,
|
||||||
|
InGame,
|
||||||
|
Replay,
|
||||||
|
SongSelect,
|
||||||
|
AudioControl,
|
||||||
|
Overlays
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,9 +2,11 @@
|
|||||||
// See the LICENCE file in the repository root for full licence text.
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
using System.Linq;
|
||||||
using JetBrains.Annotations;
|
using JetBrains.Annotations;
|
||||||
using osu.Framework.Input.Bindings;
|
using osu.Framework.Input.Bindings;
|
||||||
using osu.Game.Database;
|
using osu.Game.Database;
|
||||||
|
using osu.Game.Rulesets;
|
||||||
using Realms;
|
using Realms;
|
||||||
|
|
||||||
namespace osu.Game.Input.Bindings
|
namespace osu.Game.Input.Bindings
|
||||||
@ -26,6 +28,13 @@ namespace osu.Game.Input.Bindings
|
|||||||
set => KeyCombinationString = value.ToString();
|
set => KeyCombinationString = value.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The resultant action which is triggered by this binding.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// This implementation always returns an integer.
|
||||||
|
/// If wanting to get the actual enum-typed value, use <see cref="GetAction"/>.
|
||||||
|
/// </remarks>
|
||||||
[Ignored]
|
[Ignored]
|
||||||
public object Action
|
public object Action
|
||||||
{
|
{
|
||||||
@ -53,5 +62,20 @@ namespace osu.Game.Input.Bindings
|
|||||||
private RealmKeyBinding()
|
private RealmKeyBinding()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public object GetAction(RulesetStore rulesets)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(RulesetName))
|
||||||
|
return (GlobalAction)ActionInt;
|
||||||
|
|
||||||
|
var ruleset = rulesets.GetRuleset(RulesetName);
|
||||||
|
var actionType = ruleset!.CreateInstance()
|
||||||
|
.GetDefaultKeyBindings(Variant ?? 0)
|
||||||
|
.First() // let's just assume nobody does something stupid like mix multiple types...
|
||||||
|
.Action
|
||||||
|
.GetType();
|
||||||
|
|
||||||
|
return Enum.ToObject(actionType, ActionInt);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
// See the LICENCE file in the repository root for full licence text.
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.Sprites;
|
using osu.Framework.Graphics.Sprites;
|
||||||
using osu.Framework.Localisation;
|
using osu.Framework.Localisation;
|
||||||
@ -18,92 +19,19 @@ namespace osu.Game.Overlays.Settings.Sections.Input
|
|||||||
|
|
||||||
public override LocalisableString Header => InputSettingsStrings.GlobalKeyBindingHeader;
|
public override LocalisableString Header => InputSettingsStrings.GlobalKeyBindingHeader;
|
||||||
|
|
||||||
public GlobalKeyBindingsSection(GlobalActionContainer manager)
|
[BackgroundDependencyLoader]
|
||||||
|
private void load()
|
||||||
{
|
{
|
||||||
Add(new DefaultBindingsSubsection(manager));
|
AddRange(new[]
|
||||||
Add(new OverlayBindingsSubsection(manager));
|
|
||||||
Add(new AudioControlKeyBindingsSubsection(manager));
|
|
||||||
Add(new SongSelectKeyBindingSubsection(manager));
|
|
||||||
Add(new InGameKeyBindingsSubsection(manager));
|
|
||||||
Add(new ReplayKeyBindingsSubsection(manager));
|
|
||||||
Add(new EditorKeyBindingsSubsection(manager));
|
|
||||||
}
|
|
||||||
|
|
||||||
private partial class DefaultBindingsSubsection : KeyBindingsSubsection
|
|
||||||
{
|
|
||||||
protected override LocalisableString Header => string.Empty;
|
|
||||||
|
|
||||||
public DefaultBindingsSubsection(GlobalActionContainer manager)
|
|
||||||
: base(null)
|
|
||||||
{
|
{
|
||||||
Defaults = manager.GlobalKeyBindings;
|
new GlobalKeyBindingsSubsection(string.Empty, GlobalActionCategory.General),
|
||||||
}
|
new GlobalKeyBindingsSubsection(InputSettingsStrings.OverlaysSection, GlobalActionCategory.Overlays),
|
||||||
}
|
new GlobalKeyBindingsSubsection(InputSettingsStrings.AudioSection, GlobalActionCategory.AudioControl),
|
||||||
|
new GlobalKeyBindingsSubsection(InputSettingsStrings.SongSelectSection, GlobalActionCategory.SongSelect),
|
||||||
private partial class OverlayBindingsSubsection : KeyBindingsSubsection
|
new GlobalKeyBindingsSubsection(InputSettingsStrings.InGameSection, GlobalActionCategory.InGame),
|
||||||
{
|
new GlobalKeyBindingsSubsection(InputSettingsStrings.ReplaySection, GlobalActionCategory.Replay),
|
||||||
protected override LocalisableString Header => InputSettingsStrings.OverlaysSection;
|
new GlobalKeyBindingsSubsection(InputSettingsStrings.EditorSection, GlobalActionCategory.Editor),
|
||||||
|
});
|
||||||
public OverlayBindingsSubsection(GlobalActionContainer manager)
|
|
||||||
: base(null)
|
|
||||||
{
|
|
||||||
Defaults = manager.OverlayKeyBindings;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private partial class SongSelectKeyBindingSubsection : KeyBindingsSubsection
|
|
||||||
{
|
|
||||||
protected override LocalisableString Header => InputSettingsStrings.SongSelectSection;
|
|
||||||
|
|
||||||
public SongSelectKeyBindingSubsection(GlobalActionContainer manager)
|
|
||||||
: base(null)
|
|
||||||
{
|
|
||||||
Defaults = manager.SongSelectKeyBindings;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private partial class InGameKeyBindingsSubsection : KeyBindingsSubsection
|
|
||||||
{
|
|
||||||
protected override LocalisableString Header => InputSettingsStrings.InGameSection;
|
|
||||||
|
|
||||||
public InGameKeyBindingsSubsection(GlobalActionContainer manager)
|
|
||||||
: base(null)
|
|
||||||
{
|
|
||||||
Defaults = manager.InGameKeyBindings;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private partial class ReplayKeyBindingsSubsection : KeyBindingsSubsection
|
|
||||||
{
|
|
||||||
protected override LocalisableString Header => InputSettingsStrings.ReplaySection;
|
|
||||||
|
|
||||||
public ReplayKeyBindingsSubsection(GlobalActionContainer manager)
|
|
||||||
: base(null)
|
|
||||||
{
|
|
||||||
Defaults = manager.ReplayKeyBindings;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private partial class AudioControlKeyBindingsSubsection : KeyBindingsSubsection
|
|
||||||
{
|
|
||||||
protected override LocalisableString Header => InputSettingsStrings.AudioSection;
|
|
||||||
|
|
||||||
public AudioControlKeyBindingsSubsection(GlobalActionContainer manager)
|
|
||||||
: base(null)
|
|
||||||
{
|
|
||||||
Defaults = manager.AudioControlKeyBindings;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private partial class EditorKeyBindingsSubsection : KeyBindingsSubsection
|
|
||||||
{
|
|
||||||
protected override LocalisableString Header => InputSettingsStrings.EditorSection;
|
|
||||||
|
|
||||||
public EditorKeyBindingsSubsection(GlobalActionContainer manager)
|
|
||||||
: base(null)
|
|
||||||
{
|
|
||||||
Defaults = manager.EditorKeyBindings;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,36 @@
|
|||||||
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using osu.Framework.Localisation;
|
||||||
|
using osu.Game.Database;
|
||||||
|
using osu.Game.Input.Bindings;
|
||||||
|
using Realms;
|
||||||
|
|
||||||
|
namespace osu.Game.Overlays.Settings.Sections.Input
|
||||||
|
{
|
||||||
|
public partial class GlobalKeyBindingsSubsection : KeyBindingsSubsection
|
||||||
|
{
|
||||||
|
protected override LocalisableString Header { get; }
|
||||||
|
|
||||||
|
private readonly GlobalActionCategory category;
|
||||||
|
|
||||||
|
public GlobalKeyBindingsSubsection(LocalisableString header, GlobalActionCategory category)
|
||||||
|
{
|
||||||
|
Header = header;
|
||||||
|
this.category = category;
|
||||||
|
Defaults = GlobalActionContainer.GetDefaultBindingsFor(category);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override IEnumerable<RealmKeyBinding> GetKeyBindings(Realm realm)
|
||||||
|
{
|
||||||
|
var bindings = realm.All<RealmKeyBinding>()
|
||||||
|
.Where(b => b.RulesetName == null && b.Variant == null)
|
||||||
|
.Detach();
|
||||||
|
|
||||||
|
var actionsInSection = GlobalActionContainer.GetGlobalActionsFor(category).Cast<int>().ToHashSet();
|
||||||
|
return bindings.Where(kb => actionsInSection.Contains(kb.ActionInt));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Game.Input.Bindings;
|
|
||||||
using osu.Game.Localisation;
|
using osu.Game.Localisation;
|
||||||
using osu.Game.Rulesets;
|
using osu.Game.Rulesets;
|
||||||
|
|
||||||
@ -14,9 +13,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
|
|||||||
protected override Drawable CreateHeader() => new SettingsHeader(InputSettingsStrings.KeyBindingPanelHeader, InputSettingsStrings.KeyBindingPanelDescription);
|
protected override Drawable CreateHeader() => new SettingsHeader(InputSettingsStrings.KeyBindingPanelHeader, InputSettingsStrings.KeyBindingPanelDescription);
|
||||||
|
|
||||||
[BackgroundDependencyLoader(permitNulls: true)]
|
[BackgroundDependencyLoader(permitNulls: true)]
|
||||||
private void load(RulesetStore rulesets, GlobalActionContainer global)
|
private void load(RulesetStore rulesets)
|
||||||
{
|
{
|
||||||
AddSection(new GlobalKeyBindingsSection(global));
|
AddSection(new GlobalKeyBindingsSection());
|
||||||
|
|
||||||
foreach (var ruleset in rulesets.AvailableRulesets)
|
foreach (var ruleset in rulesets.AvailableRulesets)
|
||||||
AddSection(new RulesetBindingsSection(ruleset));
|
AddSection(new RulesetBindingsSection(ruleset));
|
||||||
|
@ -37,7 +37,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Invoked when the binding of this row is updated with a change being written.
|
/// Invoked when the binding of this row is updated with a change being written.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Action<KeyBindingRow>? BindingUpdated { get; init; }
|
public Action<KeyBindingRow>? BindingUpdated { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Whether left and right mouse button clicks should be included in the edited bindings.
|
/// Whether left and right mouse button clicks should be included in the edited bindings.
|
||||||
|
@ -11,9 +11,9 @@ using osu.Framework.Input.Bindings;
|
|||||||
using osu.Framework.Localisation;
|
using osu.Framework.Localisation;
|
||||||
using osu.Game.Database;
|
using osu.Game.Database;
|
||||||
using osu.Game.Input.Bindings;
|
using osu.Game.Input.Bindings;
|
||||||
using osu.Game.Rulesets;
|
|
||||||
using osu.Game.Localisation;
|
using osu.Game.Localisation;
|
||||||
using osuTK;
|
using osuTK;
|
||||||
|
using Realms;
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Settings.Sections.Input
|
namespace osu.Game.Overlays.Settings.Sections.Input
|
||||||
{
|
{
|
||||||
@ -27,37 +27,26 @@ namespace osu.Game.Overlays.Settings.Sections.Input
|
|||||||
|
|
||||||
protected IEnumerable<KeyBinding> Defaults { get; init; } = Array.Empty<KeyBinding>();
|
protected IEnumerable<KeyBinding> Defaults { get; init; } = Array.Empty<KeyBinding>();
|
||||||
|
|
||||||
public RulesetInfo? Ruleset { get; protected set; }
|
protected KeyBindingsSubsection()
|
||||||
|
|
||||||
private readonly int? variant;
|
|
||||||
|
|
||||||
protected KeyBindingsSubsection(int? variant)
|
|
||||||
{
|
{
|
||||||
this.variant = variant;
|
|
||||||
|
|
||||||
FlowContent.Spacing = new Vector2(0, 3);
|
FlowContent.Spacing = new Vector2(0, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(RealmAccess realm)
|
private void load(RealmAccess realm)
|
||||||
{
|
{
|
||||||
string? rulesetName = Ruleset?.ShortName;
|
var bindings = realm.Run(r => GetKeyBindings(r).Detach());
|
||||||
|
|
||||||
var bindings = realm.Run(r => r.All<RealmKeyBinding>()
|
|
||||||
.Where(b => b.RulesetName == rulesetName && b.Variant == variant)
|
|
||||||
.Detach());
|
|
||||||
|
|
||||||
foreach (var defaultGroup in Defaults.GroupBy(d => d.Action))
|
foreach (var defaultGroup in Defaults.GroupBy(d => d.Action))
|
||||||
{
|
{
|
||||||
int intKey = (int)defaultGroup.Key;
|
int intKey = (int)defaultGroup.Key;
|
||||||
|
|
||||||
// one row per valid action.
|
// one row per valid action.
|
||||||
Add(new KeyBindingRow(defaultGroup.Key, bindings.Where(b => b.ActionInt.Equals(intKey)).ToList())
|
Add(CreateKeyBindingRow(
|
||||||
{
|
defaultGroup.Key,
|
||||||
AllowMainMouseButtons = Ruleset != null,
|
bindings.Where(b => b.ActionInt.Equals(intKey)).ToList(),
|
||||||
Defaults = defaultGroup.Select(d => d.KeyCombination),
|
defaultGroup)
|
||||||
BindingUpdated = onBindingUpdated
|
.With(row => row.BindingUpdated = onBindingUpdated));
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Add(new ResetButton
|
Add(new ResetButton
|
||||||
@ -66,6 +55,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected abstract IEnumerable<RealmKeyBinding> GetKeyBindings(Realm realm);
|
||||||
|
|
||||||
|
protected virtual KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<RealmKeyBinding> keyBindings, IEnumerable<KeyBinding> defaults)
|
||||||
|
=> new KeyBindingRow(action, keyBindings.ToList())
|
||||||
|
{
|
||||||
|
AllowMainMouseButtons = false,
|
||||||
|
Defaults = defaults.Select(d => d.KeyCombination),
|
||||||
|
};
|
||||||
|
|
||||||
private void onBindingUpdated(KeyBindingRow sender)
|
private void onBindingUpdated(KeyBindingRow sender)
|
||||||
{
|
{
|
||||||
if (AutoAdvanceTarget)
|
if (AutoAdvanceTarget)
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
// See the LICENCE file in the repository root for full licence text.
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Localisation;
|
using osu.Framework.Localisation;
|
||||||
using osu.Game.Rulesets;
|
using osu.Game.Rulesets;
|
||||||
@ -18,7 +19,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
|
|||||||
public RulesetBindingsSection(RulesetInfo ruleset)
|
public RulesetBindingsSection(RulesetInfo ruleset)
|
||||||
{
|
{
|
||||||
this.ruleset = ruleset;
|
this.ruleset = ruleset;
|
||||||
|
}
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load()
|
||||||
|
{
|
||||||
var r = ruleset.CreateInstance();
|
var r = ruleset.CreateInstance();
|
||||||
|
|
||||||
foreach (int variant in r.AvailableVariants)
|
foreach (int variant in r.AvailableVariants)
|
||||||
|
@ -1,8 +1,13 @@
|
|||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
// See the LICENCE file in the repository root for full licence text.
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using osu.Framework.Input.Bindings;
|
||||||
using osu.Framework.Localisation;
|
using osu.Framework.Localisation;
|
||||||
|
using osu.Game.Input.Bindings;
|
||||||
using osu.Game.Rulesets;
|
using osu.Game.Rulesets;
|
||||||
|
using Realms;
|
||||||
|
|
||||||
namespace osu.Game.Overlays.Settings.Sections.Input
|
namespace osu.Game.Overlays.Settings.Sections.Input
|
||||||
{
|
{
|
||||||
@ -12,15 +17,33 @@ namespace osu.Game.Overlays.Settings.Sections.Input
|
|||||||
|
|
||||||
protected override LocalisableString Header { get; }
|
protected override LocalisableString Header { get; }
|
||||||
|
|
||||||
|
public RulesetInfo Ruleset { get; }
|
||||||
|
private readonly int variant;
|
||||||
|
|
||||||
public VariantBindingsSubsection(RulesetInfo ruleset, int variant)
|
public VariantBindingsSubsection(RulesetInfo ruleset, int variant)
|
||||||
: base(variant)
|
|
||||||
{
|
{
|
||||||
Ruleset = ruleset;
|
Ruleset = ruleset;
|
||||||
|
this.variant = variant;
|
||||||
|
|
||||||
var rulesetInstance = ruleset.CreateInstance();
|
var rulesetInstance = ruleset.CreateInstance();
|
||||||
|
|
||||||
Header = rulesetInstance.GetVariantName(variant);
|
Header = rulesetInstance.GetVariantName(variant);
|
||||||
Defaults = rulesetInstance.GetDefaultKeyBindings(variant);
|
Defaults = rulesetInstance.GetDefaultKeyBindings(variant);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override IEnumerable<RealmKeyBinding> GetKeyBindings(Realm realm)
|
||||||
|
{
|
||||||
|
string rulesetName = Ruleset.ShortName;
|
||||||
|
|
||||||
|
return realm.All<RealmKeyBinding>()
|
||||||
|
.Where(b => b.RulesetName == rulesetName && b.Variant == variant);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override KeyBindingRow CreateKeyBindingRow(object action, IEnumerable<RealmKeyBinding> keyBindings, IEnumerable<KeyBinding> defaults)
|
||||||
|
=> new KeyBindingRow(action, keyBindings.ToList())
|
||||||
|
{
|
||||||
|
AllowMainMouseButtons = true,
|
||||||
|
Defaults = defaults.Select(d => d.KeyCombination),
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user