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

Revert "Temporary changes to compile with latest framework"

Browse Source 
This reverts commit 34c671f712.
This commit is contained in:
Dean Herbert 2021-08-05 17:33:19 +09:00
parent 89f0739a4a
commit 27ff428491
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
View File

@ -8,8 +8,6 @@ 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;
@ -217,7 +215,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
private class HeaderText : OsuSpriteText
{
public HeaderText(LocalisableString text)
public HeaderText(string text)
{
Text = text.ToUpper();
Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold);

3
osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
View File

@ -10,7 +10,6 @@ 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;
@ -110,7 +109,7 @@ namespace osu.Game.Overlays.Rankings.Tables
{
private readonly bool isHighlighted;
public HeaderText(LocalisableString text, bool isHighlighted)
public HeaderText(string text, bool isHighlighted)
{
this.isHighlighted = isHighlighted;

5
osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
View File

@ -5,7 +5,6 @@ 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;
@ -20,7 +19,7 @@ namespace osu.Game.Overlays.Rankings.Tables
{
}
protected virtual IEnumerable<LocalisableString> GradeColumns => new List<LocalisableString> { "SS", "S", "A" };
protected virtual IEnumerable<string> GradeColumns => new List<string> { "SS", "S", "A" };
protected override TableColumn[] CreateAdditionalHeaders() => new[]
{
@ -67,7 +66,7 @@ namespace osu.Game.Overlays.Rankings.Tables
private class UserTableHeaderText : HeaderText
{
public UserTableHeaderText(LocalisableString text, bool isHighlighted, bool isGrade)
public UserTableHeaderText(string text, bool isHighlighted, bool isGrade)
: base(text, isHighlighted)
{
Margin = new MarginPadding

4
osu.Game/Screens/Edit/EditorTable.cs
View File

@ -2,12 +2,10 @@
// 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;
@ -48,7 +46,7 @@ namespace osu.Game.Screens.Edit
private class HeaderText : OsuSpriteText
{
public HeaderText(LocalisableString text)
public HeaderText(string text)
{
Text = text.ToUpper();
Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold);