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

Reorder `KeyBindingRow` members

This commit is contained in:
Bartłomiej Dach 2023-10-11 08:18:48 +02:00
parent eeb5409733
commit 1acc02405e
No known key found for this signature in database
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs
View File

@ -39,14 +39,11 @@ public partial class KeyBindingRow : Container, IFilterable
/// </summary>
public Action<KeyBindingRow> BindingUpdated { get; set; }
private readonly object action;
private readonly IEnumerable<RealmKeyBinding> bindings;
public bool AllowMainMouseButtons;
private const float transition_time = 150;
public IEnumerable<KeyCombination> Defaults;
private const float height = 20;
private const float padding = 5;
#region IFilterable
private bool matchingFilter;
@ -60,23 +57,39 @@ public bool MatchingFilter
}
}
private Container content;
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
content.ReceivePositionalInputAt(screenSpacePos);
public bool FilteringActive { get; set; }
public IEnumerable<LocalisableString> FilterTerms => bindings.Select(b => (LocalisableString)keyCombinationProvider.GetReadableString(b.KeyCombination)).Prepend(text.Text);
#endregion
private readonly object action;
private readonly IEnumerable<RealmKeyBinding> bindings;
private Bindable<bool> isDefault { get; } = new BindableBool(true);
[Resolved]
private ReadableKeyCombinationProvider keyCombinationProvider { get; set; }
[Resolved]
private RealmAccess realm { get; set; }
private Container content;
private OsuSpriteText text;
private FillFlowContainer cancelAndClearButtons;
private FillFlowContainer<KeyButton> buttons;
private Bindable<bool> isDefault { get; } = new BindableBool(true);
private KeyButton bindTarget;
public IEnumerable<LocalisableString> FilterTerms => bindings.Select(b => (LocalisableString)keyCombinationProvider.GetReadableString(b.KeyCombination)).Prepend(text.Text);
private const float transition_time = 150;
private const float height = 20;
private const float padding = 5;
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
content.ReceivePositionalInputAt(screenSpacePos);
public override bool AcceptsFocus => bindTarget == null;
public KeyBindingRow(object action, List<RealmKeyBinding> bindings)
{
@ -87,9 +100,6 @@ public KeyBindingRow(object action, List<RealmKeyBinding> bindings)
AutoSizeAxes = Axes.Y;
}
[Resolved]
private RealmAccess realm { get; set; }
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
{
@ -205,14 +215,6 @@ protected override void OnHoverLost(HoverLostEvent e)
base.OnHoverLost(e);
}
public override bool AcceptsFocus => bindTarget == null;
private KeyButton bindTarget;
public bool AllowMainMouseButtons;
public IEnumerable<KeyCombination> Defaults;
private bool isModifier(Key k) => k < Key.F1;
protected override bool OnClick(ClickEvent e) => true;