RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-15 19:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply the rest of requested changes

Browse Source
This commit is contained in:
Swords 2021-05-25 21:00:38 +10:00
parent 518999ffab
commit ce845a9f8d
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Overlays/KeyBinding/BasicKeyBindingRow.cs
View File

@ -37,10 +37,7 @@ namespace osu.Game.Overlays.KeyBinding
private FillFlowContainer cancelAndClearButtons;
private FillFlowContainer<KeyButton> buttons;
public Bindable<bool> IsDefault { get; } = new BindableBool(true)
{
Default = true
};
public Bindable<bool> IsDefault { get; } = new BindableBool(true);
public BasicKeyBindingRow(object action, IEnumerable<Framework.Input.Bindings.KeyBinding> bindings)
{

30
osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
View File

@ -32,41 +32,33 @@ namespace osu.Game.Overlays.KeyBinding
public IEnumerable<string> FilterTerms => bindings.Select(b => b.KeyCombination.ReadableString()).Prepend(key.ToString());
public KeyBindingRow(
object key,
ICollection<Input.Bindings.DatabasedKeyBinding> bindings,
RulesetInfo ruleset,
IEnumerable<KeyCombination> defaults)
{
public KeyBindingRow(object key, ICollection<Input.Bindings.DatabasedKeyBinding> bindings, RulesetInfo ruleset, IEnumerable<KeyCombination> defaults) {
this.key = key;
this.bindings = bindings;
RestoreDefaultValueButton<bool> restoreDefaultButton;
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
Padding = new MarginPadding { Right = SettingsPanel.CONTENT_MARGINS };
BasicKeyBindingRow = new BasicKeyBindingRow(key, bindings.Where(b => ((int)b.Action).Equals((int)key)))
{
AllowMainMouseButtons = ruleset != null,
Defaults = defaults
};
InternalChildren = new Drawable[]
{
restoreDefaultButton = new RestoreDefaultValueButton<bool>(),
new RestoreDefaultValueButton<bool>()
{
Current = BasicKeyBindingRow.IsDefault,
Action = () => { BasicKeyBindingRow.RestoreDefaults(); }
},
new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Padding = new MarginPadding { Left = SettingsPanel.CONTENT_MARGINS },
Child = BasicKeyBindingRow
Child = BasicKeyBindingRow = new BasicKeyBindingRow(key, bindings.Where(b => ((int)b.Action).Equals((int)key)))
{
AllowMainMouseButtons = ruleset != null,
Defaults = defaults
}
},
};
restoreDefaultButton.Action = () => { BasicKeyBindingRow.RestoreDefaults(); };
restoreDefaultButton.Current = BasicKeyBindingRow.IsDefault;
}
}
}