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

Update FooterButtonRandom to comply with the changes in FooterButton

Browse Source 
FooterButtonRandom now has 2 Action variables, one for both primary and secondary
This commit is contained in:
Jack Boswell (boswelja)
2020-06-04 16:07:50 +12:00
parent 05e4499bc1
commit 568503ef99
1 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,19 +1,22 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osuTK.Input;
using osu.Game.Input.Bindings;
namespace osu.Game.Screens.Select
{
public class FooterButtonRandom : FooterButton
{
public Action PrimaryAction { get; set; }
public Action SecondaryAction { get; set; }
private readonly SpriteText secondaryText;
private bool secondaryActive;
@ -37,21 +40,7 @@ namespace osu.Game.Screens.Select
SelectedColour = colours.Green;
DeselectedColour = SelectedColour.Opacity(0.5f);
Text = @"random";
Hotkey = Key.F2;
}
protected override bool OnKeyDown(KeyDownEvent e)
{
secondaryActive = e.ShiftPressed;
updateText();
return base.OnKeyDown(e);
}
protected override void OnKeyUp(KeyUpEvent e)
{
secondaryActive = e.ShiftPressed;
updateText();
base.OnKeyUp(e);
Hotkey = GlobalAction.SelectNextRandom;
}
private void updateText()
@ -67,5 +56,34 @@ namespace osu.Game.Screens.Select
secondaryText.FadeOut(120, Easing.InQuad);
}
}
public override bool OnPressed(GlobalAction action)
{
switch (action)
{
case GlobalAction.SelectPreviousRandom:
secondaryActive = true;
Action = SecondaryAction;
updateText();
Click();
return true;
case GlobalAction.SelectNextRandom:
Action = PrimaryAction;
updateText();
Click();
return true;
default:
return false;
}
}
public override void OnReleased(GlobalAction action)
{
if (action == GlobalAction.SelectPreviousRandom)
{
secondaryActive = false;
updateText();
}
}
}
}