sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +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

8
osu.Game/Overlays/Direct/DirectGridPanel.cs
View File

@ -186,8 +186,8 @@ namespace osu.Game.Overlays.Direct
Margin = new MarginPadding { Top = vertical_padding, Right = vertical_padding },
Children = new[]
{
new Statistic(FontAwesome.PlayCircle, SetInfo.OnlineInfo?.PlayCount ?? 0),
new Statistic(FontAwesome.Heart, SetInfo.OnlineInfo?.FavouriteCount ?? 0),
new Statistic(FontAwesome.Solid.PlayCircle, SetInfo.OnlineInfo?.PlayCount ?? 0),
new Statistic(FontAwesome.Solid.Heart, SetInfo.OnlineInfo?.FavouriteCount ?? 0),
},
},
statusContainer = new FillFlowContainer
@ -206,12 +206,12 @@ namespace osu.Game.Overlays.Direct
if (SetInfo.OnlineInfo?.HasVideo ?? false)
{
statusContainer.Add(new IconPill(FontAwesome.Film));
statusContainer.Add(new IconPill(FontAwesome.Solid.Film));
}
if (SetInfo.OnlineInfo?.HasStoryboard ?? false)
{
statusContainer.Add(new IconPill(FontAwesome.Image));
statusContainer.Add(new IconPill(FontAwesome.Solid.Image));
}
statusContainer.Add(new BeatmapSetOnlineStatusPill

8
osu.Game/Overlays/Direct/DirectListPanel.cs
View File

@ -161,8 +161,8 @@ namespace osu.Game.Overlays.Direct
Direction = FillDirection.Vertical,
Children = new Drawable[]
{
new Statistic(FontAwesome.PlayCircle, SetInfo.OnlineInfo?.PlayCount ?? 0),
new Statistic(FontAwesome.Heart, SetInfo.OnlineInfo?.FavouriteCount ?? 0),
new Statistic(FontAwesome.Solid.PlayCircle, SetInfo.OnlineInfo?.PlayCount ?? 0),
new Statistic(FontAwesome.Solid.Heart, SetInfo.OnlineInfo?.FavouriteCount ?? 0),
new FillFlowContainer
{
Anchor = Anchor.TopRight,
@ -211,12 +211,12 @@ namespace osu.Game.Overlays.Direct
if (SetInfo.OnlineInfo?.HasVideo ?? false)
{
statusContainer.Add(new IconPill(FontAwesome.Film) { IconSize = new Vector2(20) });
statusContainer.Add(new IconPill(FontAwesome.Solid.Film) { IconSize = new Vector2(20) });
}
if (SetInfo.OnlineInfo?.HasStoryboard ?? false)
{
statusContainer.Add(new IconPill(FontAwesome.Image) { IconSize = new Vector2(20) });
statusContainer.Add(new IconPill(FontAwesome.Solid.Image) { IconSize = new Vector2(20) });
}
statusContainer.Add(new BeatmapSetOnlineStatusPill

4
osu.Game/Overlays/Direct/DownloadButton.cs
View File

@ -49,7 +49,7 @@ namespace osu.Game.Overlays.Direct
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(13),
Icon = FontAwesome.Download,
Icon = FontAwesome.Solid.Download,
},
checkmark = new SpriteIcon
{
@ -57,7 +57,7 @@ namespace osu.Game.Overlays.Direct
Origin = Anchor.Centre,
X = 8,
Size = Vector2.Zero,
Icon = FontAwesome.Check,
Icon = FontAwesome.Solid.Check,
}
}
}

4
osu.Game/Overlays/Direct/PlayButton.cs
View File

@ -74,7 +74,7 @@ namespace osu.Game.Overlays.Direct
Origin = Anchor.Centre,
FillMode = FillMode.Fit,
RelativeSizeAxes = Axes.Both,
Icon = FontAwesome.Play,
Icon = FontAwesome.Solid.Play,
},
loadingAnimation = new LoadingAnimation
{
@ -116,7 +116,7 @@ namespace osu.Game.Overlays.Direct
private void playingStateChanged(ValueChangedEvent<bool> e)
{
icon.Icon = e.NewValue ? FontAwesome.Stop : FontAwesome.Play;
icon.Icon = e.NewValue ? FontAwesome.Solid.Stop : FontAwesome.Solid.Play;
icon.FadeColour(e.NewValue || IsHovered ? hoverColour : Color4.White, 120, Easing.InOutQuint);
if (e.NewValue)