h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 21:07:33 +08:00
Code Issues Releases Wiki Activity

Add reset button

Browse Source 
Also fixes a regression causing multiple rows to be displayed for a single action
This commit is contained in:
Dean Herbert 2017-08-23 19:26:49 +09:00
parent e9dde822a1
commit c99ed6fd44
2 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,6 +109,17 @@ namespace osu.Game.Overlays.KeyBinding
buttons.Add(new KeyButton(b)); buttons.Add(new KeyButton(b));
} }
public void RestoreDefaults()
{
int i = 0;
foreach (var d in Defaults)
{
var button = buttons[i++];
button.UpdateKeyCombination(d);
store.Update(button.KeyBinding);
}
}
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)
{ {
this.FadeEdgeEffectTo<Container>(1, transition_time, Easing.OutQuint); this.FadeEdgeEffectTo<Container>(1, transition_time, Easing.OutQuint);
@ -129,6 +140,8 @@ namespace osu.Game.Overlays.KeyBinding
public bool AllowMainMouseButtons; public bool AllowMainMouseButtons;
public IEnumerable<KeyCombination> Defaults;
private bool isModifier(Key k) => k < Key.F1; private bool isModifier(Key k) => k < Key.F1;
protected override bool OnClick(InputState state) => true; protected override bool OnClick(InputState state) => true;

36
osu.Game/Overlays/KeyBinding/KeyBindingsSubsection.cs
View File

@ -4,10 +4,14 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Input; using osu.Game.Input;
using osu.Game.Overlays.Settings; using osu.Game.Overlays.Settings;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using OpenTK; using OpenTK;
using osu.Game.Graphics;
namespace osu.Game.Overlays.KeyBinding namespace osu.Game.Overlays.KeyBinding
{ {
@ -31,14 +35,38 @@ namespace osu.Game.Overlays.KeyBinding
{ {
var bindings = store.Query(Ruleset?.ID, variant); var bindings = store.Query(Ruleset?.ID, variant);
foreach (var defaultBinding in Defaults) foreach (var defaultGroup in Defaults.GroupBy(d => d.Action))
{ {
// one row per valid action. // one row per valid action.
Add(new KeyBindingRow(defaultBinding.Action, bindings.Where(b => b.Action.Equals((int)defaultBinding.Action))) Add(new KeyBindingRow(defaultGroup.Key, bindings.Where(b => b.Action.Equals((int)defaultGroup.Key)))
{ {
AllowMainMouseButtons = Ruleset != null AllowMainMouseButtons = Ruleset != null,
Defaults = defaultGroup.Select(d => d.KeyCombination)
}); });
} }
Add(new ResetButton
{
Action = () => Children.OfType<KeyBindingRow>().ForEach(k => k.RestoreDefaults())
});
} }
} }
}
internal class ResetButton : OsuButton
{
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
Text = "Reset";
RelativeSizeAxes = Axes.X;
Margin = new MarginPadding { Top = 5 };
Height = 20;
Content.CornerRadius = 5;
BackgroundColour = colours.PinkDark;
Triangles.ColourDark = colours.PinkDarker;
Triangles.ColourLight = colours.Pink;
}
}
}