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

Allow Rulesets to create a non-FontAwesome icon

Browse Source 
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
This commit is contained in:
Dean Herbert
2017-08-03 14:36:21 +09:00
parent d72a479d9d
commit 0d9ea97828
55 changed files with 317 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -247,21 +247,21 @@ namespace osu.Game.Screens.Select
AutoSizeAxes = Axes.Both;
Children = new Drawable[]
{
new TextAwesome
new SpriteIcon
{
Icon = FontAwesome.fa_square,
Origin = Anchor.Centre,
Colour = new Color4(68, 17, 136, 255),
Rotation = 45,
TextSize = 20
Size = new Vector2(20),
},
new TextAwesome
new SpriteIcon
{
Icon = statistic.Icon,
Origin = Anchor.Centre,
Colour = new Color4(255, 221, 85, 255),
Scale = new Vector2(0.8f),
TextSize = 20
Size = new Vector2(20),
},
new OsuSpriteText
{

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

@ -121,7 +121,7 @@ namespace osu.Game.Screens.Select
//{
// Font = @"Exo2.0-Bold",
// Text = "Sort results by",
// TextSize = 14,
// Size = 14,
// Margin = new MarginPadding
// {
// Top = 5,

14
osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
View File

@ -334,25 +334,23 @@ namespace osu.Game.Screens.Select.Leaderboards
Children = new[]
{
new TextAwesome
new SpriteIcon
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
Icon = FontAwesome.fa_osu_mod_bg,
Colour = colour,
Shadow = true,
TextSize = 30,
UseFullGlyphHeight = false,
Size = new Vector2(30),
},
new TextAwesome
new SpriteIcon
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
Icon = icon,
Colour = OsuColour.Gray(84),
TextSize = 18,
Size = new Vector2(18),
Position = new Vector2(0f, 2f),
UseFullGlyphHeight = false,
},
};
}
@ -369,7 +367,7 @@ namespace osu.Game.Screens.Select.Leaderboards
Children = new Drawable[]
{
new TextAwesome
new SpriteIcon
{
Origin = Anchor.Centre,
Icon = FontAwesome.fa_square,
@ -377,7 +375,7 @@ namespace osu.Game.Screens.Select.Leaderboards
Rotation = 45,
Shadow = true,
},
new TextAwesome
new SpriteIcon
{
Origin = Anchor.Centre,
Icon = icon,

6
osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Screens.Select.Options
private readonly Box background;
private readonly Box flash;
private readonly TextAwesome iconText;
private readonly SpriteIcon iconText;
private readonly OsuSpriteText firstLine;
private readonly OsuSpriteText secondLine;
private readonly Container box;
@ -134,11 +134,11 @@ namespace osu.Game.Screens.Select.Options
Direction = FillDirection.Vertical,
Children = new Drawable[]
{
iconText = new TextAwesome
iconText = new SpriteIcon
{
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
TextSize = 30,
Size = new Vector2(30),
Shadow = true,
Icon = FontAwesome.fa_close,
Margin = new MarginPadding