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

Merge remote-tracking branch 'Joehuu/master' into drawnode-composability

Browse Source 
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
This commit is contained in:
smoogipoo
2019-04-08 23:01:12 +09:00
parent a56e29347f f2f60f6d03
commit 772bef91fa
143 changed files with 1654 additions and 1127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,7 +149,7 @@ namespace osu.Game.Overlays
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Action = prev,
Icon = FontAwesome.StepBackward,
Icon = FontAwesome.Solid.StepBackward,
},
playButton = new MusicIconButton
{
@ -158,14 +158,14 @@ namespace osu.Game.Overlays
Scale = new Vector2(1.4f),
IconScale = new Vector2(1.4f),
Action = play,
Icon = FontAwesome.PlayCircleOutline,
Icon = FontAwesome.Regular.PlayCircle,
},
nextButton = new MusicIconButton
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Action = () => next(),
Icon = FontAwesome.StepForward,
Icon = FontAwesome.Solid.StepForward,
},
}
},
@ -174,7 +174,7 @@ namespace osu.Game.Overlays
Origin = Anchor.Centre,
Anchor = Anchor.CentreRight,
Position = new Vector2(-bottom_black_area_height / 2, 0),
Icon = FontAwesome.Bars,
Icon = FontAwesome.Solid.Bars,
Action = () => playlist.ToggleVisibility(),
},
}
@ -265,13 +265,13 @@ namespace osu.Game.Overlays
progressBar.EndTime = track.Length;
progressBar.CurrentTime = track.CurrentTime;
playButton.Icon = track.IsRunning ? FontAwesome.PauseCircleOutline : FontAwesome.PlayCircleOutline;
playButton.Icon = track.IsRunning ? FontAwesome.Regular.PauseCircle : FontAwesome.Regular.PlayCircle;
}
else
{
progressBar.CurrentTime = 0;
progressBar.EndTime = 1;
playButton.Icon = FontAwesome.PlayCircleOutline;
playButton.Icon = FontAwesome.Regular.PlayCircle;
}
}