sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18011 from frenzibyte/rewind-shift-click

Browse Source 
Allow rewinding random in song select with "Shift + Left Click"
This commit is contained in:
Dean Herbert
2022-04-29 23:10:29 +09:00
committed by GitHub
parent 43ff4635a2 856ca96b66
commit 5c04ab18ec
2 changed files with 126 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
osu.Game/Screens/Select/FooterButtonRandom.cs
View File

@ -10,6 +10,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Input.Bindings;
using osuTK;
using osuTK.Input;
namespace osu.Game.Screens.Select
{
@ -25,7 +26,7 @@ namespace osu.Game.Screens.Select
{
SelectedColour = colours.Green;
DeselectedColour = SelectedColour.Opacity(0.5f);
Text = @"random";
updateText();
Action = () =>
{
@ -59,6 +60,44 @@ namespace osu.Game.Screens.Select
};
}
protected override bool OnKeyDown(KeyDownEvent e)
{
updateText(e.ShiftPressed);
return base.OnKeyDown(e);
}
protected override void OnKeyUp(KeyUpEvent e)
{
updateText(e.ShiftPressed);
base.OnKeyUp(e);
}
protected override bool OnClick(ClickEvent e)
{
try
{
// this uses OR to handle rewinding when clicks are triggered by other sources (i.e. right button in OnMouseUp).
rewindSearch |= e.ShiftPressed;
return base.OnClick(e);
}
finally
{
rewindSearch = false;
}
}
protected override void OnMouseUp(MouseUpEvent e)
{
if (e.Button == MouseButton.Right)
{
rewindSearch = true;
TriggerClick();
return;
}
base.OnMouseUp(e);
}
public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
{
rewindSearch = e.Action == GlobalAction.SelectPreviousRandom;
@ -79,5 +118,7 @@ namespace osu.Game.Screens.Select
rewindSearch = false;
}
}
private void updateText(bool rewind = false) => Text = rewind ? "rewind" : "random";
}
}