From d218e7d935f057fc306d5be2d6e4aa9a19bbc122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 30 Oct 2021 19:22:00 +0200
Subject: [PATCH] Remove manual romanisation handling in `PlaylistItem`

---
 osu.Game/Overlays/Music/PlaylistItem.cs | 33 +++++++++++--------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index 04f1f14b20..ce4e9e9698 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -25,9 +25,6 @@ namespace osu.Game.Overlays.Music
         private TextFlowContainer text;
         private ITextPart titlePart;
 
-        private ILocalisedBindableString title;
-        private ILocalisedBindableString artist;
-
         private Color4 selectedColour;
         private Color4 artistColour;
 
@@ -45,17 +42,12 @@ namespace osu.Game.Overlays.Music
             selectedColour = colours.Yellow;
             artistColour = colours.Gray9;
             HandleColour = colours.Gray5;
-
-            title = localisation.GetLocalisedBindableString(new RomanisableString(Model.Metadata.TitleUnicode, Model.Metadata.Title));
-            artist = localisation.GetLocalisedBindableString(new RomanisableString(Model.Metadata.ArtistUnicode, Model.Metadata.Artist));
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            artist.BindValueChanged(_ => recreateText(), true);
-
             SelectedSet.BindValueChanged(set =>
             {
                 if (set.OldValue?.Equals(Model) != true && set.NewValue?.Equals(Model) != true)
@@ -71,26 +63,31 @@ namespace osu.Game.Overlays.Music
                 s.FadeColour(SelectedSet.Value?.Equals(Model) == true ? selectedColour : Color4.White, instant ? 0 : FADE_DURATION);
         }
 
-        protected override Drawable CreateContent() => text = new OsuTextFlowContainer
+        protected override Drawable CreateContent()
         {
-            RelativeSizeAxes = Axes.X,
-            AutoSizeAxes = Axes.Y,
-        };
+            text = new OsuTextFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+            };
 
-        private void recreateText()
-        {
-            text.Clear();
+            var title = new RomanisableString(Model.Metadata.TitleUnicode, Model.Metadata.Title);
+            var artist = new RomanisableString(Model.Metadata.ArtistUnicode, Model.Metadata.Artist);
 
-            // space after the title to put a space between the title and artist
-            titlePart = text.AddText(title.Value + @"  ", sprite => sprite.Font = OsuFont.GetFont(weight: FontWeight.Regular));
+            titlePart = text.AddText(title, sprite => sprite.Font = OsuFont.GetFont(weight: FontWeight.Regular));
             updateSelectionState(true);
+            titlePart.DrawablePartsRecreated += _ => updateSelectionState(true);
 
-            text.AddText(artist.Value, sprite =>
+            text.AddText(@"  "); // to separate the title from the artist.
+
+            text.AddText(artist, sprite =>
             {
                 sprite.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold);
                 sprite.Colour = artistColour;
                 sprite.Padding = new MarginPadding { Top = 1 };
             });
+
+            return text;
         }
 
         protected override bool OnClick(ClickEvent e)