From d5c56aab7a03d3b8539de7fd6bef0e5a09efe6b9 Mon Sep 17 00:00:00 2001 From: EVAST9919 Date: Fri, 28 Apr 2017 21:05:00 +0300 Subject: [PATCH 1/5] Initial commit --- osu.Game/Screens/Play/PlayerLoader.cs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs index 765abd9873..69aef1ceb9 100644 --- a/osu.Game/Screens/Play/PlayerLoader.cs +++ b/osu.Game/Screens/Play/PlayerLoader.cs @@ -14,6 +14,7 @@ using osu.Game.Graphics.Sprites; using osu.Game.Screens.Backgrounds; using osu.Game.Screens.Menu; using OpenTK; +using osu.Framework.Localisation; namespace osu.Game.Screens.Play { @@ -177,8 +178,20 @@ namespace osu.Game.Screens.Play } + private readonly SpriteText title; + private readonly SpriteText artist; + private readonly WorkingBeatmap beatmap; + + [BackgroundDependencyLoader] + private void load(LocalisationEngine localisation) + { + title.Current = localisation.GetUnicodePreference(beatmap.BeatmapSetInfo.Metadata.TitleUnicode, beatmap.BeatmapSetInfo.Metadata.Title); + artist.Current = localisation.GetUnicodePreference(beatmap.BeatmapSetInfo.Metadata.ArtistUnicode, beatmap.BeatmapSetInfo.Metadata.Artist); + } + public BeatmapMetadataDisplay(WorkingBeatmap beatmap) { + this.beatmap = beatmap; var metadata = beatmap?.BeatmapInfo?.Metadata ?? new BeatmapMetadata(); AutoSizeAxes = Axes.Both; @@ -192,7 +205,7 @@ namespace osu.Game.Screens.Play Direction = FillDirection.Vertical, Children = new Drawable[] { - new OsuSpriteText + title = new OsuSpriteText { Text = metadata.Title, TextSize = 36, @@ -200,7 +213,7 @@ namespace osu.Game.Screens.Play Origin = Anchor.TopCentre, Anchor = Anchor.TopCentre, }, - new OsuSpriteText + artist = new OsuSpriteText { Text = metadata.Artist, TextSize = 26, From a8c918f7bf26dca7ac5545645ed5d7812cc2d6c5 Mon Sep 17 00:00:00 2001 From: EVAST9919 Date: Fri, 28 Apr 2017 21:12:48 +0300 Subject: [PATCH 2/5] Removed empty line --- osu.Game/Screens/Play/PlayerLoader.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs index 69aef1ceb9..7eb189a007 100644 --- a/osu.Game/Screens/Play/PlayerLoader.cs +++ b/osu.Game/Screens/Play/PlayerLoader.cs @@ -175,7 +175,6 @@ namespace osu.Game.Screens.Play } }; } - } private readonly SpriteText title; From e9094bac51344fa4db1b7b5ff1397062ba8a85e2 Mon Sep 17 00:00:00 2001 From: EVAST9919 Date: Sun, 30 Apr 2017 17:05:00 +0300 Subject: [PATCH 3/5] Added suggested changes --- osu.Game/Screens/Play/PlayerLoader.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs index 7eb189a007..9199407246 100644 --- a/osu.Game/Screens/Play/PlayerLoader.cs +++ b/osu.Game/Screens/Play/PlayerLoader.cs @@ -179,19 +179,18 @@ namespace osu.Game.Screens.Play private readonly SpriteText title; private readonly SpriteText artist; - private readonly WorkingBeatmap beatmap; + private readonly BeatmapMetadata metadata; [BackgroundDependencyLoader] private void load(LocalisationEngine localisation) { - title.Current = localisation.GetUnicodePreference(beatmap.BeatmapSetInfo.Metadata.TitleUnicode, beatmap.BeatmapSetInfo.Metadata.Title); - artist.Current = localisation.GetUnicodePreference(beatmap.BeatmapSetInfo.Metadata.ArtistUnicode, beatmap.BeatmapSetInfo.Metadata.Artist); + title.Current = localisation.GetUnicodePreference(metadata.TitleUnicode, metadata.Title); + artist.Current = localisation.GetUnicodePreference(metadata.ArtistUnicode, metadata.Artist); } public BeatmapMetadataDisplay(WorkingBeatmap beatmap) { - this.beatmap = beatmap; - var metadata = beatmap?.BeatmapInfo?.Metadata ?? new BeatmapMetadata(); + metadata = beatmap?.BeatmapInfo?.Metadata ?? new BeatmapMetadata(); AutoSizeAxes = Axes.Both; Children = new Drawable[] From 668262ed06a3e432d1dd46d7700b7dfbc3922a83 Mon Sep 17 00:00:00 2001 From: EVAST9919 Date: Mon, 1 May 2017 04:53:46 +0300 Subject: [PATCH 4/5] Applied requested changes --- osu.Game/Screens/Play/PlayerLoader.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs index 9199407246..f703a52989 100644 --- a/osu.Game/Screens/Play/PlayerLoader.cs +++ b/osu.Game/Screens/Play/PlayerLoader.cs @@ -181,13 +181,6 @@ namespace osu.Game.Screens.Play private readonly SpriteText artist; private readonly BeatmapMetadata metadata; - [BackgroundDependencyLoader] - private void load(LocalisationEngine localisation) - { - title.Current = localisation.GetUnicodePreference(metadata.TitleUnicode, metadata.Title); - artist.Current = localisation.GetUnicodePreference(metadata.ArtistUnicode, metadata.Artist); - } - public BeatmapMetadataDisplay(WorkingBeatmap beatmap) { metadata = beatmap?.BeatmapInfo?.Metadata ?? new BeatmapMetadata(); @@ -269,6 +262,13 @@ namespace osu.Game.Screens.Play } }; } + + [BackgroundDependencyLoader] + private void load(LocalisationEngine localisation) + { + title.Current = localisation.GetUnicodePreference(metadata.TitleUnicode, metadata.Title); + artist.Current = localisation.GetUnicodePreference(metadata.ArtistUnicode, metadata.Artist); + } } } } From 0386e965732bec358093901ec42ade260b7f44ab Mon Sep 17 00:00:00 2001 From: EVAST9919 Date: Mon, 1 May 2017 05:38:51 +0300 Subject: [PATCH 5/5] applied requested changes --- osu.Game/Screens/Play/PlayerLoader.cs | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs index f703a52989..9afa1018c6 100644 --- a/osu.Game/Screens/Play/PlayerLoader.cs +++ b/osu.Game/Screens/Play/PlayerLoader.cs @@ -177,13 +177,17 @@ namespace osu.Game.Screens.Play } } - private readonly SpriteText title; - private readonly SpriteText artist; - private readonly BeatmapMetadata metadata; + private readonly WorkingBeatmap beatmap; public BeatmapMetadataDisplay(WorkingBeatmap beatmap) { - metadata = beatmap?.BeatmapInfo?.Metadata ?? new BeatmapMetadata(); + this.beatmap = beatmap; + } + + [BackgroundDependencyLoader] + private void load(LocalisationEngine localisation) + { + var metadata = beatmap?.BeatmapInfo?.Metadata ?? new BeatmapMetadata(); AutoSizeAxes = Axes.Both; Children = new Drawable[] @@ -196,17 +200,17 @@ namespace osu.Game.Screens.Play Direction = FillDirection.Vertical, Children = new Drawable[] { - title = new OsuSpriteText + new OsuSpriteText { - Text = metadata.Title, + Current = localisation.GetUnicodePreference(metadata.TitleUnicode, metadata.Title), TextSize = 36, Font = @"Exo2.0-MediumItalic", Origin = Anchor.TopCentre, Anchor = Anchor.TopCentre, }, - artist = new OsuSpriteText + new OsuSpriteText { - Text = metadata.Artist, + Current = localisation.GetUnicodePreference(metadata.ArtistUnicode, metadata.Artist), TextSize = 26, Font = @"Exo2.0-MediumItalic", Origin = Anchor.TopCentre, @@ -262,13 +266,6 @@ namespace osu.Game.Screens.Play } }; } - - [BackgroundDependencyLoader] - private void load(LocalisationEngine localisation) - { - title.Current = localisation.GetUnicodePreference(metadata.TitleUnicode, metadata.Title); - artist.Current = localisation.GetUnicodePreference(metadata.ArtistUnicode, metadata.Artist); - } } } }