sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Flip order back to original for romanisable strings

Browse Source
This commit is contained in:
Dean Herbert
2021-02-25 14:12:59 +09:00
parent 4cdde42228
commit e82eaffaed
13 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
View File

@ -75,8 +75,8 @@ namespace osu.Game.Tournament.Components
new TournamentSpriteText new TournamentSpriteText
{ {
Text = new RomanisableString( Text = new RomanisableString(
$"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}", $"{Beatmap.Metadata.ArtistUnicode ?? Beatmap.Metadata.Artist} - {Beatmap.Metadata.TitleUnicode ?? Beatmap.Metadata.Title}",
$"{Beatmap.Metadata.ArtistUnicode ?? Beatmap.Metadata.Artist} - {Beatmap.Metadata.TitleUnicode ?? Beatmap.Metadata.Title}"), $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}"),
Font = OsuFont.Torus.With(weight: FontWeight.Bold), Font = OsuFont.Torus.With(weight: FontWeight.Bold),
}, },
new FillFlowContainer new FillFlowContainer

4
osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
View File

@ -84,14 +84,14 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
{ {
new OsuSpriteText new OsuSpriteText
{ {
Text = new RomanisableString(SetInfo.Metadata.Title, SetInfo.Metadata.TitleUnicode), Text = new RomanisableString(SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title),
Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true) Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
}, },
} }
}, },
new OsuSpriteText new OsuSpriteText
{ {
Text = new RomanisableString(SetInfo.Metadata.Artist, SetInfo.Metadata.ArtistUnicode), Text = new RomanisableString(SetInfo.Metadata.ArtistUnicode, SetInfo.Metadata.Artist),
Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true) Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true)
}, },
}, },

4
osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
View File

@ -107,14 +107,14 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
{ {
new OsuSpriteText new OsuSpriteText
{ {
Text = new RomanisableString(SetInfo.Metadata.Title, SetInfo.Metadata.TitleUnicode), Text = new RomanisableString(SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title),
Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true) Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
}, },
} }
}, },
new OsuSpriteText new OsuSpriteText
{ {
Text = new RomanisableString(SetInfo.Metadata.Artist, SetInfo.Metadata.ArtistUnicode), Text = new RomanisableString(SetInfo.Metadata.ArtistUnicode, SetInfo.Metadata.Artist),
Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true) Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true)
}, },
} }

4
osu.Game/Overlays/Music/PlaylistItem.cs
View File

@ -48,8 +48,8 @@ namespace osu.Game.Overlays.Music
artistColour = colours.Gray9; artistColour = colours.Gray9;
HandleColour = colours.Gray5; HandleColour = colours.Gray5;
title = localisation.GetLocalisedString(new RomanisableString(Model.Metadata.Title, Model.Metadata.TitleUnicode)); title = localisation.GetLocalisedString(new RomanisableString(Model.Metadata.TitleUnicode, Model.Metadata.Title));
artist = localisation.GetLocalisedString(new RomanisableString(Model.Metadata.Artist, Model.Metadata.ArtistUnicode)); artist = localisation.GetLocalisedString(new RomanisableString(Model.Metadata.ArtistUnicode, Model.Metadata.Artist));
} }
protected override void LoadComplete() protected override void LoadComplete()

4
osu.Game/Overlays/NowPlayingOverlay.cs
View File

@ -293,8 +293,8 @@ namespace osu.Game.Overlays
else else
{ {
BeatmapMetadata metadata = beatmap.Metadata; BeatmapMetadata metadata = beatmap.Metadata;
title.Text = new RomanisableString(metadata.Title, metadata.TitleUnicode); title.Text = new RomanisableString(metadata.TitleUnicode, metadata.Title);
artist.Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode); artist.Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist);
} }
}); });

6
osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
View File

@ -130,13 +130,13 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
new OsuSpriteText new OsuSpriteText
{ {
Text = new RomanisableString( Text = new RomanisableString(
$"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} [{beatmap.Version}] ", $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} [{beatmap.Version}] ",
$"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} [{beatmap.Version}] "), $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} [{beatmap.Version}] "),
Font = OsuFont.GetFont(weight: FontWeight.Bold) Font = OsuFont.GetFont(weight: FontWeight.Bold)
}, },
new OsuSpriteText new OsuSpriteText
{ {
Text = "by " + new RomanisableString(beatmap.Metadata.Artist, beatmap.Metadata.ArtistUnicode), Text = "by " + new RomanisableString(beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist),
Font = OsuFont.GetFont(weight: FontWeight.Regular) Font = OsuFont.GetFont(weight: FontWeight.Regular)
}, },
}; };

6
osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
View File

@ -257,15 +257,15 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Text = new RomanisableString( Text = new RomanisableString(
$"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} ", $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} ",
$"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} "), $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} "),
Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold, italics: true) Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold, italics: true)
}, },
new OsuSpriteText new OsuSpriteText
{ {
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Text = "by " + new RomanisableString(beatmap.Metadata.Artist, beatmap.Metadata.ArtistUnicode), Text = "by " + new RomanisableString(beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist),
Font = OsuFont.GetFont(size: 12, italics: true) Font = OsuFont.GetFont(size: 12, italics: true)
}, },
}; };

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

@ -61,8 +61,8 @@ namespace osu.Game.Screens.Menu
{ {
var metadata = beatmap.Value.Metadata; var metadata = beatmap.Value.Metadata;
title.Text = new RomanisableString(metadata.Title, metadata.TitleUnicode); title.Text = new RomanisableString(metadata.TitleUnicode, metadata.Title);
artist.Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode); artist.Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist);
this.FadeInFromZero(fade_duration / 2f) this.FadeInFromZero(fade_duration / 2f)
.Delay(4000) .Delay(4000)

4
osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
View File

@ -73,7 +73,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
{ {
new OsuSpriteText new OsuSpriteText
{ {
Text = new RomanisableString(beatmap.Value.Metadata.Artist, beatmap.Value.Metadata.ArtistUnicode), Text = new RomanisableString(beatmap.Value.Metadata.ArtistUnicode, beatmap.Value.Metadata.Artist),
Font = OsuFont.GetFont(size: TextSize), Font = OsuFont.GetFont(size: TextSize),
}, },
new OsuSpriteText new OsuSpriteText
@ -83,7 +83,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
}, },
new OsuSpriteText new OsuSpriteText
{ {
Text = new RomanisableString(beatmap.Value.Metadata.Title, beatmap.Value.Metadata.TitleUnicode), Text = new RomanisableString(beatmap.Value.Metadata.TitleUnicode, beatmap.Value.Metadata.Title),
Font = OsuFont.GetFont(size: TextSize), Font = OsuFont.GetFont(size: TextSize),
} }
}, LinkAction.OpenBeatmap, beatmap.Value.OnlineBeatmapID.ToString(), "Open beatmap"); }, LinkAction.OpenBeatmap, beatmap.Value.OnlineBeatmapID.ToString(), "Open beatmap");

4
osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
View File

@ -73,7 +73,7 @@ namespace osu.Game.Screens.Play
}), }),
new OsuSpriteText new OsuSpriteText
{ {
Text = new RomanisableString(metadata.Title, metadata.TitleUnicode), Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),
Font = OsuFont.GetFont(size: 36, italics: true), Font = OsuFont.GetFont(size: 36, italics: true),
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
@ -81,7 +81,7 @@ namespace osu.Game.Screens.Play
}, },
new OsuSpriteText new OsuSpriteText
{ {
Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode), Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist),
Font = OsuFont.GetFont(size: 26, italics: true), Font = OsuFont.GetFont(size: 26, italics: true),
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,

4
osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
View File

@ -101,7 +101,7 @@ namespace osu.Game.Screens.Ranking.Expanded
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Text = new RomanisableString(metadata.Title, metadata.TitleUnicode), Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),
Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold), Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2, MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
Truncate = true, Truncate = true,
@ -110,7 +110,7 @@ namespace osu.Game.Screens.Ranking.Expanded
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode), Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist),
Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold), Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2, MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
Truncate = true, Truncate = true,

4
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -187,8 +187,8 @@ namespace osu.Game.Screens.Select
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
titleBinding = localisation.GetLocalisedString(new RomanisableString(metadata.Title, metadata.TitleUnicode)); titleBinding = localisation.GetLocalisedString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
artistBinding = localisation.GetLocalisedString(new RomanisableString(metadata.Artist, metadata.ArtistUnicode)); artistBinding = localisation.GetLocalisedString(new RomanisableString(metadata.ArtistUnicode, metadata.Artist));
Children = new Drawable[] Children = new Drawable[]
{ {

4
osu.Game/Screens/Select/Carousel/SetPanelContent.cs
View File

@ -41,13 +41,13 @@ namespace osu.Game.Screens.Select.Carousel
{ {
new OsuSpriteText new OsuSpriteText
{ {
Text = new RomanisableString(beatmapSet.Metadata.Title, beatmapSet.Metadata.TitleUnicode), Text = new RomanisableString(beatmapSet.Metadata.TitleUnicode, beatmapSet.Metadata.Title),
Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 22, italics: true), Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 22, italics: true),
Shadow = true, Shadow = true,
}, },
new OsuSpriteText new OsuSpriteText
{ {
Text = new RomanisableString(beatmapSet.Metadata.Artist, beatmapSet.Metadata.ArtistUnicode), Text = new RomanisableString(beatmapSet.Metadata.ArtistUnicode, beatmapSet.Metadata.Artist),
Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 17, italics: true), Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 17, italics: true),
Shadow = true, Shadow = true,
}, },