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

Added PauseOverlay.TogglePaused, renamed OnPlay and similar to OnResume, made Pause and Play public, added proper testing for the visual test(pause button instead of auto-pause, logging actions), made PauseOverlay's fade duration a constant instead of statically typed

Browse Source
This commit is contained in:
DrabWeb
2017-01-27 07:11:22 -04:00
parent 81de5a2097
commit 3ed88ea043
3 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game/Overlays/Pause/PauseOverlay.cs
View File

@ -16,9 +16,10 @@ namespace osu.Game.Overlays.Pause
public class PauseOverlay : OverlayContainer
{
private bool paused = false;
private int fadeDuration = 100;
public event Action OnPause;
public event Action OnPlay;
public event Action OnResume;
public event Action OnRetry;
public event Action OnQuit;
@ -39,7 +40,7 @@ namespace osu.Game.Overlays.Pause
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
Position = new Vector2(0, -200),
Action = Play
Action = Resume
},
new PauseButton
{
@ -61,13 +62,13 @@ namespace osu.Game.Overlays.Pause
protected override void PopIn()
{
this.FadeTo(1, 100, EasingTypes.In);
this.FadeTo(1, fadeDuration, EasingTypes.In);
paused = true;
}
protected override void PopOut()
{
this.FadeTo(0, 100, EasingTypes.In);
this.FadeTo(0, fadeDuration, EasingTypes.In);
paused = false;
}
@ -76,23 +77,28 @@ namespace osu.Game.Overlays.Pause
switch (args.Key)
{
case Key.Escape:
paused = !paused;
(paused ? (Action)Pause : Play)?.Invoke();
TogglePaused();
return true;
}
return base.OnKeyDown(state, args);
}
private void Pause()
public void Pause()
{
Show();
OnPause?.Invoke();
}
private void Play()
public void Resume()
{
Hide();
OnPlay?.Invoke();
Hide();
OnResume?.Invoke();
}
public void TogglePaused()
{
ToggleVisibility();
(paused ? (Action)Pause : Resume)?.Invoke();
}
private void Retry()