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

Update icon usage to match framework changes

Browse Source
This commit is contained in:
Dean Herbert
2019-03-27 19:29:27 +09:00
parent 4e8945a2aa
commit de80fc0eac
159 changed files with 467 additions and 1307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Overlays/BeatmapSet/BasicStats.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Sprites;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
@ -74,10 +75,10 @@ namespace osu.Game.Overlays.BeatmapSet
Direction = FillDirection.Horizontal,
Children = new[]
{
length = new Statistic(FontAwesome.fa_clock_o, "Length") { Width = 0.25f },
bpm = new Statistic(FontAwesome.fa_circle, "BPM") { Width = 0.25f },
circleCount = new Statistic(FontAwesome.fa_circle_o, "Circle Count") { Width = 0.25f },
sliderCount = new Statistic(FontAwesome.fa_circle, "Slider Count") { Width = 0.25f },
length = new Statistic(FontAwesome.ClockOutline, "Length") { Width = 0.25f },
bpm = new Statistic(FontAwesome.Circle, "BPM") { Width = 0.25f },
circleCount = new Statistic(FontAwesome.CircleOutline, "Circle Count") { Width = 0.25f },
sliderCount = new Statistic(FontAwesome.Circle, "Slider Count") { Width = 0.25f },
},
};
}
@ -101,7 +102,7 @@ namespace osu.Game.Overlays.BeatmapSet
set => this.value.Text = value;
}
public Statistic(FontAwesome icon, string name)
public Statistic(IconUsage icon, string name)
{
this.name = name;
RelativeSizeAxes = Axes.X;
@ -120,7 +121,7 @@ namespace osu.Game.Overlays.BeatmapSet
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.Centre,
Icon = FontAwesome.fa_square,
Icon = FontAwesome.Square,
Size = new Vector2(13),
Rotation = 45,
Colour = OsuColour.FromHex(@"441288"),

7
osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
View File

@ -10,6 +10,7 @@ using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables;
@ -130,8 +131,8 @@ namespace osu.Game.Overlays.BeatmapSet
Margin = new MarginPadding { Top = 5 },
Children = new[]
{
plays = new Statistic(FontAwesome.fa_play_circle),
favourites = new Statistic(FontAwesome.fa_heart),
plays = new Statistic(FontAwesome.PlayCircle),
favourites = new Statistic(FontAwesome.Heart),
},
},
},
@ -292,7 +293,7 @@ namespace osu.Game.Overlays.BeatmapSet
}
}
public Statistic(FontAwesome icon)
public Statistic(IconUsage icon)
{
AutoSizeAxes = Axes.Both;
Direction = FillDirection.Horizontal;

3
osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Sprites;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
@ -77,7 +78,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
Depth = -1,
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Icon = FontAwesome.fa_download,
Icon = FontAwesome.Download,
Size = new Vector2(16),
Margin = new MarginPadding { Right = 5 },
},

7
osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds;
using osuTK;
@ -47,7 +48,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Icon = FontAwesome.fa_heart_o,
Icon = FontAwesome.HeartOutline,
Size = new Vector2(18),
Shadow = false,
},
@ -58,12 +59,12 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
if (favourited.NewValue)
{
pink.FadeIn(200);
icon.Icon = FontAwesome.fa_heart;
icon.Icon = FontAwesome.Heart;
}
else
{
pink.FadeOut(200);
icon.Icon = FontAwesome.fa_heart_o;
icon.Icon = FontAwesome.HeartOutline;
}
};