sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Auto assign hotkeys for BeatmapOptionsButton."

Browse Source 
This reverts commit beb0a8ff03.
This commit is contained in:
Huo Yaoyuan
2017-03-14 21:13:57 +08:00
parent e1cc74bb40
commit c939897a8a
4 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
View File

@ -12,7 +12,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Input;
using osu.Game.Graphics;
namespace osu.Game.Screens.Select.Options
@ -91,7 +90,7 @@ namespace osu.Game.Screens.Select.Options
/// <para>Lower depth to be put on the left, and higher to be put on the right.</para>
/// <para>Notice this is different to <see cref="Footer"/>!</para>
/// </param>
public void AddButton(string firstLine, string secongLine, FontAwesome icon, Color4 colour, Action action, float depth = 0)
public void AddButton(string firstLine, string secongLine, FontAwesome icon, Color4 colour, Action action, Key? hotkey = null, float depth = 0)
{
buttonsContainer.Add(new BeatmapOptionsButton
{
@ -105,26 +104,10 @@ namespace osu.Game.Screens.Select.Options
Hide();
action?.Invoke();
},
HotKey = hotkey
});
}
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{
if (args.Repeat) return false;
int index = (int)args.Key - (int)Key.Number1;
if (index >= 0 && index <= 9)
{
// Children of ButtonFlow is reversed. The same reason of depth in AddButton.
var button = buttonsContainer.Children.Reverse().ElementAtOrDefault(index);
if (button != null)
{
button.TriggerClick();
return true;
}
}
return base.OnKeyDown(state, args);
}
private class ButtonFlow : FillFlowContainer<BeatmapOptionsButton>
{
protected override IComparer<Drawable> DepthComparer => new ReverseCreationOrderDepthComparer();