h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 10:03:05 +08:00
Code Issues Releases Wiki Activity

Explicitly set exo typeface in a few places

Browse Source
This commit is contained in:
smoogipoo 2019-02-21 19:26:02 +09:00
parent d99eaa3fce
commit 8853f7ad76
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/OsuFont.cs
View File

@ -69,7 +69,7 @@ namespace osu.Game.Graphics
string weightString = weight.ToString(); string weightString = weight.ToString();
// Only exo has an explicit "regular" weight, other fonts do not // Only exo has an explicit "regular" weight, other fonts do not
if (family != "Exo2.0" && weight == FontWeight.Regular) if (family != GetFamilyString(Typeface.Exo) && weight == FontWeight.Regular)
weightString = string.Empty; weightString = string.Empty;
return weightString; return weightString;

2
osu.Game/Graphics/UserInterface/OsuTabControl.cs
View File

@ -173,7 +173,7 @@ namespace osu.Game.Graphics.UserInterface
new HoverClickSounds() new HoverClickSounds()
}; };
Active.BindValueChanged(val => Text.Font = Text.Font.With(weight: val ? FontWeight.Bold : FontWeight.Medium), true); Active.BindValueChanged(val => Text.Font = Text.Font.With(Typeface.Exo, weight: val ? FontWeight.Bold : FontWeight.Medium), true);
} }
protected override void OnActivated() => fadeActive(); protected override void OnActivated() => fadeActive();

2
osu.Game/Graphics/UserInterface/PageTabControl.cs
View File

@ -59,7 +59,7 @@ namespace osu.Game.Graphics.UserInterface
new HoverClickSounds() new HoverClickSounds()
}; };
Active.BindValueChanged(val => Text.Font = Text.Font.With(weight: val ? FontWeight.Bold : FontWeight.Medium), true); Active.BindValueChanged(val => Text.Font = Text.Font.With(Typeface.Exo, weight: val ? FontWeight.Bold : FontWeight.Medium), true);
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]

2
osu.Game/Overlays/AccountCreation/ScreenEntry.cs
View File

@ -129,7 +129,7 @@ namespace osu.Game.Overlays.AccountCreation
usernameDescription.AddText("This will be your public presence. No profanity, no impersonation. Avoid exposing your own personal details, too!"); usernameDescription.AddText("This will be your public presence. No profanity, no impersonation. Avoid exposing your own personal details, too!");
emailAddressDescription.AddText("Will be used for notifications, account verification and in the case you forget your password. No spam, ever."); emailAddressDescription.AddText("Will be used for notifications, account verification and in the case you forget your password. No spam, ever.");
emailAddressDescription.AddText(" Make sure to get it right!", cp => cp.Font = cp.Font.With(weight: FontWeight.Bold)); emailAddressDescription.AddText(" Make sure to get it right!", cp => cp.Font = cp.Font.With(Typeface.Exo, weight: FontWeight.Bold));
passwordDescription.AddText("At least "); passwordDescription.AddText("At least ");
characterCheckText = passwordDescription.AddText("8 characters long"); characterCheckText = passwordDescription.AddText("8 characters long");

2
osu.Game/Overlays/Profile/ProfileHeader.cs
View File

@ -349,7 +349,7 @@ namespace osu.Game.Overlays.Profile
colourBar.Show(); colourBar.Show();
} }
void boldItalic(SpriteText t) => t.Font = t.Font.With(weight: FontWeight.Bold, italics: true); void boldItalic(SpriteText t) => t.Font = t.Font.With(Typeface.Exo, weight: FontWeight.Bold, italics: true);
void lightText(SpriteText t) => t.Alpha = 0.8f; void lightText(SpriteText t) => t.Alpha = 0.8f;
OsuSpriteText createScoreText(string text) => new OsuSpriteText OsuSpriteText createScoreText(string text) => new OsuSpriteText

4
osu.Game/Screens/Menu/Disclaimer.cs
View File

@ -64,8 +64,8 @@ namespace osu.Game.Screens.Menu
} }
}; };
textFlow.AddText("This is an ", t => t.Font = t.Font.With(size: 30, weight: FontWeight.Light)); textFlow.AddText("This is an ", t => t.Font = t.Font.With(Typeface.Exo, 30, FontWeight.Light));
textFlow.AddText("early development build", t => t.Font = t.Font.With(size: 30, weight: FontWeight.SemiBold)); textFlow.AddText("early development build", t => t.Font = t.Font.With(Typeface.Exo, 30, FontWeight.SemiBold));
textFlow.AddParagraph("Things may not work as expected", t => t.Font = t.Font.With(size: 20)); textFlow.AddParagraph("Things may not work as expected", t => t.Font = t.Font.With(size: 20));
textFlow.NewParagraph(); textFlow.NewParagraph();