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

Merge pull request #2023 from peppy/fix-skip-button

Browse Source 
Fix skip button not receiving screen-wide input
This commit is contained in:
Dan Balasescu
2018-02-06 15:09:06 +09:00
committed by GitHub
parent 8bbb59831e b46c388b4c
commit fdcab55c51
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Screens/Play/SkipButton.cs
View File

@ -32,6 +32,8 @@ namespace osu.Game.Screens.Play
private FadeContainer fadeContainer; private FadeContainer fadeContainer;
private double displayTime; private double displayTime;
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
public SkipButton(double startTime) public SkipButton(double startTime)
{ {
this.startTime = startTime; this.startTime = startTime;
@ -153,16 +155,11 @@ namespace osu.Game.Screens.Play
public Visibility State public Visibility State
{ {
get get { return state; }
{
return state;
}
set set
{ {
if (state == value) bool stateChanged = value != state;
return;
var lastState = state;
state = value; state = value;
scheduledHide?.Cancel(); scheduledHide?.Cancel();
@ -170,7 +167,8 @@ namespace osu.Game.Screens.Play
switch (state) switch (state)
{ {
case Visibility.Visible: case Visibility.Visible:
if (lastState == Visibility.Hidden) // we may be triggered to become visible mnultiple times but we only want to transform once.
if (stateChanged)
this.FadeIn(500, Easing.OutExpo); this.FadeIn(500, Easing.OutExpo);
if (!IsHovered) if (!IsHovered)