h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 13:22:55 +08:00
Code Issues Releases Wiki Activity

Rename FontColour to TextColour

Browse Source
This commit is contained in:
Daniel Cios 2024-09-20 16:50:17 +02:00
parent ec575e9de4
commit 73b6744a97
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Localisation/SkinComponents/SkinnableComponentStrings.cs
View File

@ -70,14 +70,14 @@ namespace osu.Game.Localisation.SkinComponents
public static LocalisableString ColourDescription => new TranslatableString(getKey(@"colour_description"), @"The colour of the component.");
/// <summary>
/// "Font colour"
/// "Text colour"
/// </summary>
public static LocalisableString FontColour => new TranslatableString(getKey(@"font_colour"), @"Font colour");
public static LocalisableString TextColour => new TranslatableString(getKey(@"text_colour"), @"Text colour");
/// <summary>
/// "The colour of the font."
/// "The colour of the text."
/// </summary>
public static LocalisableString FontColourDescription => new TranslatableString(getKey(@"font_colour_description"), @"The colour of the font.");
public static LocalisableString TextColourDescription => new TranslatableString(getKey(@"text_colour_description"), @"The colour of the text.");
private static string getKey(string key) => $@"{prefix}:{key}";
}

2
osu.Game/Skinning/Components/BeatmapAttributeText.cs
View File

@ -124,7 +124,7 @@ namespace osu.Game.Skinning.Components
protected override void SetFont(FontUsage font) => text.Font = font.With(size: 40);
protected override void SetFontColour(Colour4 fontColour) => text.Colour = fontColour;
protected override void SetTextColour(Colour4 textColour) => text.Colour = textColour;
}
// WARNING: DO NOT ADD ANY VALUES TO THIS ENUM ANYWHERE ELSE THAN AT THE END.

2
osu.Game/Skinning/Components/PlayerName.cs
View File

@ -54,6 +54,6 @@ namespace osu.Game.Skinning.Components
protected override void SetFont(FontUsage font) => text.Font = font.With(size: 40);
protected override void SetFontColour(Colour4 fontColour) => text.Colour = fontColour;
protected override void SetTextColour(Colour4 textColour) => text.Colour = textColour;
}
}

2
osu.Game/Skinning/Components/TextElement.cs
View File

@ -37,6 +37,6 @@ namespace osu.Game.Skinning.Components
protected override void SetFont(FontUsage font) => text.Font = font.With(size: 40);
protected override void SetFontColour(Colour4 fontColour) => text.Colour = fontColour;
protected override void SetTextColour(Colour4 textColour) => text.Colour = textColour;
}
}

8
osu.Game/Skinning/FontAdjustableSkinComponent.cs
View File

@ -21,15 +21,15 @@ namespace osu.Game.Skinning
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Font), nameof(SkinnableComponentStrings.FontDescription))]
public Bindable<Typeface> Font { get; } = new Bindable<Typeface>(Typeface.Torus);
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.FontColour), nameof(SkinnableComponentStrings.FontColourDescription))]
public BindableColour4 FontColour { get; } = new BindableColour4(Colour4.White);
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.TextColour), nameof(SkinnableComponentStrings.TextColourDescription))]
public BindableColour4 TextColour { get; } = new BindableColour4(Colour4.White);
/// <summary>
/// Implement to apply the user font selection to one or more components.
/// </summary>
protected abstract void SetFont(FontUsage font);
protected abstract void SetFontColour(Colour4 fontColour);
protected abstract void SetTextColour(Colour4 textColour);
protected override void LoadComplete()
{
@ -44,7 +44,7 @@ namespace osu.Game.Skinning
SetFont(f);
}, true);
FontColour.BindValueChanged(e => SetFontColour(e.NewValue), true);
TextColour.BindValueChanged(e => SetTextColour(e.NewValue), true);
}
}
}