h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 21:02:55 +08:00
Code Issues Releases Wiki Activity

Rename to IsUserPaused

Browse Source
This commit is contained in:
Dean Herbert 2019-07-11 00:18:19 +09:00
parent 9986178bf4
commit b225b2eb39
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Overlays/MusicController.cs
View File

@ -55,7 +55,7 @@ namespace osu.Game.Overlays
private Container dragContainer;
private Container playerContainer;
public bool UserRequestedPause { get; private set; }
public bool IsUserPaused { get; private set; }
[Resolved]
private Bindable<WorkingBeatmap> beatmap { get; set; }
@ -159,7 +159,7 @@ namespace osu.Game.Overlays
Origin = Anchor.Centre,
Scale = new Vector2(1.4f),
IconScale = new Vector2(1.4f),
Action = play,
Action = togglePause,
Icon = FontAwesome.Regular.PlayCircle,
},
nextButton = new MusicIconButton
@ -278,7 +278,7 @@ namespace osu.Game.Overlays
}
}
private void play()
private void togglePause()
{
var track = current?.Track;
@ -289,12 +289,16 @@ namespace osu.Game.Overlays
return;
}
UserRequestedPause = track.IsRunning;
if (track.IsRunning)
{
IsUserPaused = true;
track.Stop();
}
else
{
track.Start();
IsUserPaused = false;
}
}
private void prev()

2
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -193,7 +193,7 @@ namespace osu.Game.Screens.Menu
//we may have consumed our preloaded instance, so let's make another.
preloadSongSelect();
if (Beatmap.Value.Track != null && !musicController.UserRequestedPause)
if (Beatmap.Value.Track != null && !musicController.IsUserPaused)
Beatmap.Value.Track.Start();
}

2
osu.Game/Screens/Select/SongSelect.cs
View File

@ -573,7 +573,7 @@ namespace osu.Game.Screens.Select
{
Track track = Beatmap.Value.Track;
if ((!track.IsRunning || restart) && !musicController.UserRequestedPause)
if ((!track.IsRunning || restart) && !musicController.IsUserPaused)
{
track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
track.Restart();