Merge pull request #32312 from peppy/disable-spectator-font-customisation

Disable user customisation of spectator list font / colour

Author: bdach

osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorList.cs

@@ -75,8 +75,8 @@ public void TestBasics()
             AddRepeatStep("remove random user", () => ((ISpectatorClient)spectatorClient).UserEndedWatching(
                 spectatorClient.WatchingUsers[RNG.Next(spectatorClient.WatchingUsers.Count)].OnlineID), 5);
 
-            AddStep("change font to venera", () => list.Font.Value = Typeface.Venera);
-            AddStep("change font to torus", () => list.Font.Value = Typeface.Torus);
+            AddStep("change font to venera", () => list.HeaderFont.Value = Typeface.Venera);
+            AddStep("change font to torus", () => list.HeaderFont.Value = Typeface.Torus);
             AddStep("change header colour", () => list.HeaderColour.Value = new Colour4(RNG.NextSingle(), RNG.NextSingle(), RNG.NextSingle(), 1));
 
             AddStep("enter break", () => playingState.Value = LocalUserPlayingState.Break);

osu.Game/Screens/Play/HUD/SpectatorList.cs

@@ -13,12 +13,10 @@
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
-using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.Chat;
 using osu.Game.Localisation.HUD;
-using osu.Game.Localisation.SkinComponents;
+using osu.Game.Online.Chat;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Spectator;
 using osu.Game.Skinning;
@@ -31,10 +29,7 @@ public partial class SpectatorList : CompositeDrawable, ISerialisableDrawable
     {
         private const int max_spectators_displayed = 10;
 
-        [SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Font), nameof(SkinnableComponentStrings.FontDescription))]
-        public Bindable<Typeface> Font { get; } = new Bindable<Typeface>(Typeface.Torus);
-
-        [SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.TextColour), nameof(SkinnableComponentStrings.TextColourDescription))]
+        public Bindable<Typeface> HeaderFont { get; } = new Bindable<Typeface>(Typeface.Torus);
         public BindableColour4 HeaderColour { get; } = new BindableColour4(Colour4.White);
 
         private BindableList<SpectatorUser> watchingUsers { get; } = new BindableList<SpectatorUser>();
@@ -97,7 +92,7 @@ protected override void LoadComplete()
             watchingUsers.BindCollectionChanged(onSpectatorsChanged, true);
             userPlayingState.BindValueChanged(_ => updateVisibility());
 
-            Font.BindValueChanged(_ => updateAppearance());
+            HeaderFont.BindValueChanged(_ => updateAppearance());
             HeaderColour.BindValueChanged(_ => updateAppearance(), true);
             FinishTransforms(true);
 
@@ -198,7 +193,7 @@ private void updateVisibility()
 
         private void updateAppearance()
         {
-            header.Font = OsuFont.GetFont(Font.Value, 12, FontWeight.Bold);
+            header.Font = OsuFont.GetFont(HeaderFont.Value, 12, FontWeight.Bold);
             header.Colour = HeaderColour.Value;
 
             Width = header.DrawWidth;

osu.Game/Skinning/TrianglesSkin.cs

@@ -158,7 +158,7 @@ public TrianglesSkin(SkinInfo skin, IStorageResourceProvider resources)
 
                                 if (spectatorList != null)
                                 {
-                                    spectatorList.Font.Value = Typeface.Venera;
+                                    spectatorList.HeaderFont.Value = Typeface.Venera;
                                     spectatorList.HeaderColour.Value = new OsuColour().BlueLighter;
                                     spectatorList.Anchor = Anchor.BottomLeft;
                                     spectatorList.Origin = Anchor.BottomLeft;