h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-24 07:14:10 +08:00
Code Issues Releases Wiki Activity

Temporary changes to compile with latest framework

Browse Source
This commit is contained in:
smoogipoo
2021-07-27 12:06:52 +09:00
Unverified
parent 5b06a9d120
commit 34c671f712
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+3 -1
View File
@@ -8,6 +8,8 @@ using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Extensions;
using osu.Framework.Extensions.EnumExtensions;
using osu.Framework.Extensions.LocalisationExtensions;
using osu.Framework.Localisation;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
@@ -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);
osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
+2 -1
View File
@@ -10,6 +10,7 @@ using osu.Framework.Extensions;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Localisation;
using osu.Game.Users;
using osu.Game.Users.Drawables;
using osuTK;
@@ -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;
osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
+3 -2
View File
@@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Linq;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Localisation;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Users;
@@ -19,7 +20,7 @@ namespace osu.Game.Overlays.Rankings.Tables
{
}
protected virtual IEnumerable<string> GradeColumns => new List<string> { "SS", "S", "A" };
protected virtual IEnumerable<LocalisableString> GradeColumns => new List<LocalisableString> { "SS", "S", "A" };
protected override TableColumn[] CreateAdditionalHeaders() => new[]
{
@@ -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
osu.Game/Screens/Edit/EditorTable.cs
+3 -1
View File
@@ -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);