mirror of
https://github.com/ppy/osu.git
synced 2025-03-15 17:47:18 +08:00
Apply changes in-line with framework changes.
This commit is contained in:
parent
6f35036f53
commit
94877117b9
@ -18,6 +18,8 @@ using osu.Game.Scoring;
|
||||
using osu.Game.Users.Drawables;
|
||||
using osuTK;
|
||||
using osuTK.Graphics;
|
||||
using osu.Framework.Localisation;
|
||||
using osu.Framework.Extensions.LocalisationExtensions;
|
||||
|
||||
namespace osu.Game.Overlays.BeatmapSet.Scores
|
||||
{
|
||||
@ -215,7 +217,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
|
||||
|
||||
private class HeaderText : OsuSpriteText
|
||||
{
|
||||
public HeaderText(string text)
|
||||
public HeaderText(LocalisableString text)
|
||||
{
|
||||
Text = text.ToUpper();
|
||||
Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold);
|
||||
|
@ -13,6 +13,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
|
||||
using osu.Game.Users;
|
||||
using osu.Game.Users.Drawables;
|
||||
using osuTK;
|
||||
using osu.Framework.Localisation;
|
||||
|
||||
namespace osu.Game.Overlays.Rankings.Tables
|
||||
{
|
||||
@ -109,7 +110,7 @@ namespace osu.Game.Overlays.Rankings.Tables
|
||||
{
|
||||
private readonly bool isHighlighted;
|
||||
|
||||
public HeaderText(string text, bool isHighlighted)
|
||||
public HeaderText(LocalisableString text, bool isHighlighted)
|
||||
{
|
||||
this.isHighlighted = isHighlighted;
|
||||
|
||||
|
@ -9,6 +9,7 @@ using osu.Game.Graphics;
|
||||
using osu.Game.Graphics.Containers;
|
||||
using osu.Game.Users;
|
||||
using osu.Game.Scoring;
|
||||
using osu.Framework.Localisation;
|
||||
|
||||
namespace osu.Game.Overlays.Rankings.Tables
|
||||
{
|
||||
@ -32,7 +33,7 @@ namespace osu.Game.Overlays.Rankings.Tables
|
||||
protected override Drawable CreateHeader(int index, TableColumn column)
|
||||
{
|
||||
var title = column?.Header ?? string.Empty;
|
||||
return new UserTableHeaderText(title, HighlightedColumn == title, GradeColumns.Contains(title));
|
||||
return new UserTableHeaderText(title, HighlightedColumn == title, GradeColumns.Contains(title.ToString()));
|
||||
}
|
||||
|
||||
protected sealed override Country GetCountry(UserStatistics item) => item.User.Country;
|
||||
@ -66,7 +67,7 @@ namespace osu.Game.Overlays.Rankings.Tables
|
||||
|
||||
private class UserTableHeaderText : HeaderText
|
||||
{
|
||||
public UserTableHeaderText(string text, bool isHighlighted, bool isGrade)
|
||||
public UserTableHeaderText(LocalisableString text, bool isHighlighted, bool isGrade)
|
||||
: base(text, isHighlighted)
|
||||
{
|
||||
Margin = new MarginPadding
|
||||
|
@ -2,10 +2,12 @@
|
||||
// See the LICENCE file in the repository root for full licence text.
|
||||
|
||||
using osu.Framework.Allocation;
|
||||
using osu.Framework.Extensions.LocalisationExtensions;
|
||||
using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Containers;
|
||||
using osu.Framework.Graphics.Shapes;
|
||||
using osu.Framework.Input.Events;
|
||||
using osu.Framework.Localisation;
|
||||
using osu.Game.Graphics;
|
||||
using osu.Game.Graphics.Containers;
|
||||
using osu.Game.Graphics.Sprites;
|
||||
@ -46,7 +48,7 @@ namespace osu.Game.Screens.Edit
|
||||
|
||||
private class HeaderText : OsuSpriteText
|
||||
{
|
||||
public HeaderText(string text)
|
||||
public HeaderText(LocalisableString text)
|
||||
{
|
||||
Text = text.ToUpper();
|
||||
Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold);
|
||||
|
Loading…
x
Reference in New Issue
Block a user