Merge pull request #80 from ELDment/beta-1

skuzzis · web-flow · commit 26e22d46a6b7 · 2025-11-05T17:41:47.000+02:00
diff --git a/managed/src/SwiftlyS2.Core/Modules/Menus/Menu.cs b/managed/src/SwiftlyS2.Core/Modules/Menus/Menu.cs
diff --git a/managed/src/SwiftlyS2.Core/Modules/Menus/MenuManager.cs b/managed/src/SwiftlyS2.Core/Modules/Menus/MenuManager.cs
@@ -47,13 +47,12 @@ internal class MenuManager : IMenuManager
     private SoundEvent _exitSound = new();
     private SoundEvent _scrollSound = new();
 
-    public MenuManager(ISwiftlyCore core)
+    public MenuManager( ISwiftlyCore core )
     {
         _Core = core;
         var settings = NativeEngineHelpers.GetMenuSettings();
         var parts = settings.Split('\x01');
-        Settings = new MenuSettings
-        {
+        Settings = new MenuSettings {
             NavigationPrefix = parts[0],
             InputMode = parts[1],
             ButtonsUse = parts[2],
@@ -92,7 +91,7 @@ public MenuManager(ISwiftlyCore core)
         _Core.Event.OnMapUnload -= OnMapUnload;
     }
 
-    void KeyStateChange(IOnClientKeyStateChangedEvent @event)
+    void KeyStateChange( IOnClientKeyStateChangedEvent @event )
     {
         var player = _Core.PlayerManager.GetPlayer(@event.PlayerId);
         var menu = GetMenu(player);
@@ -106,6 +105,17 @@ void KeyStateChange(IOnClientKeyStateChangedEvent @event)
             var exitKey = menu.ButtonOverrides?.Exit ?? StringToKeyKind.GetValueOrDefault(Settings.ButtonsExit);
             var useKey = menu.ButtonOverrides?.Select ?? StringToKeyKind.GetValueOrDefault(Settings.ButtonsUse);
 
+            new Dictionary<string, KeyKind> { { "Scroll", scrollKey }, { "ScrollBack", scrollBackKey }, { "Exit", exitKey }, { "Use", useKey } }
+                .GroupBy(kvp => kvp.Value)
+                .Where(g => g.Count() > 1 && @event.Key.HasFlag(g.Key))
+                .ToList()
+                .ForEach(group =>
+                {
+                    Spectre.Console.AnsiConsole.WriteException(
+                        new InvalidOperationException($"Duplicate key binding detected in menu '{menu.Title}': Key '{group.Key}' is used by: {string.Join(", ", group.Select(kvp => kvp.Key))}")
+                    );
+                });
+
             if (@event.Key == scrollKey)
             {
                 menu.MoveSelection(player, 1);
@@ -201,7 +211,7 @@ void KeyStateChange(IOnClientKeyStateChangedEvent @event)
         }
     }
 
-    public void OnClientDisconnected(IOnClientDisconnectedEvent @event)
+    public void OnClientDisconnected( IOnClientDisconnectedEvent @event )
     {
         var player = _Core.PlayerManager.GetPlayer(@event.PlayerId);
         if (player == null)
@@ -221,7 +231,7 @@ public void OnClientDisconnected(IOnClientDisconnectedEvent @event)
         }
     }
 
-    public void OnMapUnload(IOnMapUnloadEvent _)
+    public void OnMapUnload( IOnMapUnloadEvent _ )
     {
         CloseAllMenus();
     }
@@ -242,7 +252,7 @@ public void CloseAllMenus()
         OpenMenus.Clear();
     }
 
-    public void CloseMenu(IMenu menu)
+    public void CloseMenu( IMenu menu )
     {
         foreach (var kvp in OpenMenus)
         {
@@ -256,7 +266,7 @@ public void CloseMenu(IMenu menu)
         }
     }
 
-    public void CloseMenuByTitle(string title, bool exact = false)
+    public void CloseMenuByTitle( string title, bool exact = false )
     {
         foreach (var kvp in OpenMenus)
         {
@@ -270,7 +280,7 @@ public void CloseMenuByTitle(string title, bool exact = false)
         }
     }
 
-    public void CloseMenuForPlayer(IPlayer player)
+    public void CloseMenuForPlayer( IPlayer player )
     {
         if (OpenMenus.TryRemove(player, out var menu))
         {
@@ -283,17 +293,17 @@ public void CloseMenuForPlayer(IPlayer player)
         }
     }
 
-    public IMenu CreateMenu(string title)
+    public IMenu CreateMenu( string title )
     {
         return new Menu { Title = title, MenuManager = this, MaxVisibleOptions = Settings.ItemsPerPage, _Core = _Core };
     }
 
-    public IMenu? GetMenu(IPlayer player)
+    public IMenu? GetMenu( IPlayer player )
     {
         return OpenMenus.TryGetValue(player, out var menu) ? menu : null;
     }
 
-    public void OpenMenu(IPlayer player, IMenu menu)
+    public void OpenMenu( IPlayer player, IMenu menu )
     {
         if (OpenMenus.TryGetValue(player, out var currentMenu))
         {
@@ -306,7 +316,7 @@ public void OpenMenu(IPlayer player, IMenu menu)
         OnMenuOpened?.Invoke(player, menu);
     }
 
-    public bool HasMenuOpen(IPlayer player)
+    public bool HasMenuOpen( IPlayer player )
     {
         return NativePlayer.HasMenuShown(player.PlayerID);
     }
diff --git a/managed/src/SwiftlyS2.Core/Modules/Menus/Options/AsyncButtonMenuOption.cs b/managed/src/SwiftlyS2.Core/Modules/Menus/Options/AsyncButtonMenuOption.cs
@@ -50,7 +50,7 @@ public bool CanInteract(IPlayer player)
         return !IsLoading && (EnabledCheck?.Invoke(player) ?? true);
     }
 
-    public string GetDisplayText(IPlayer player)
+    public string GetDisplayText(IPlayer player, bool updateHorizontalStyle = false)
     {
         var sizeClass = MenuSizeHelper.GetSizeClass(Size);
 
@@ -59,7 +59,7 @@ public string GetDisplayText(IPlayer player)
             return $"<font class='{sizeClass}' color='#ffaa00'>{_loadingText ?? "Loading..."}</font>";
         }
 
-        var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle) ?? Text;
+        var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle, updateHorizontalStyle) ?? Text;
         if (!CanInteract(player))
         {
             return $"<font class='{sizeClass}' color='grey'>{text}</font>";
diff --git a/managed/src/SwiftlyS2.Core/Modules/Menus/Options/ButtonMenuOption.cs b/managed/src/SwiftlyS2.Core/Modules/Menus/Options/ButtonMenuOption.cs
@@ -47,11 +47,11 @@ public bool CanInteract(IPlayer player)
         return EnabledCheck?.Invoke(player) ?? true;
     }
 
-    public string GetDisplayText(IPlayer player)
+    public string GetDisplayText(IPlayer player, bool updateHorizontalStyle = false)
     {
         var sizeClass = MenuSizeHelper.GetSizeClass(Size);
 
-        var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle) ?? Text;
+        var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle, updateHorizontalStyle) ?? Text;
         if (!CanInteract(player))
         {
             return $"<font class='{sizeClass}' color='grey'>{text}</font>";
diff --git a/managed/src/SwiftlyS2.Core/Modules/Menus/Options/ChoiceMenuButton.cs b/managed/src/SwiftlyS2.Core/Modules/Menus/Options/ChoiceMenuButton.cs
@@ -67,13 +67,13 @@ public bool CanInteract(IPlayer player)
         return EnabledCheck?.Invoke(player) ?? true;
     }
 
-    public string GetDisplayText(IPlayer player)
+    public string GetDisplayText(IPlayer player, bool updateHorizontalStyle = false)
     {
         var sizeClass = MenuSizeHelper.GetSizeClass(Size);
 
         var choice = $"<font color='{Menu!.RenderColor.ToHex(true)}'>[</font>{SelectedChoice}<font color='{Menu.RenderColor.ToHex(true)}'>]</font>";
 
-        var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle) ?? Text;
+        var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle, updateHorizontalStyle) ?? Text;
         if (!CanInteract(player))
         {
             return $"<font class='{sizeClass}' color='grey'>{text}: {choice}</font>";
diff --git a/managed/src/SwiftlyS2.Core/Modules/Menus/Options/DynamicMenuOption.cs b/managed/src/SwiftlyS2.Core/Modules/Menus/Options/DynamicMenuOption.cs
@@ -56,7 +56,7 @@ public bool CanInteract(IPlayer player)
         return _onClick != null && (_enabledCheck?.Invoke(player) ?? true);
     }
 
-    public string GetDisplayText(IPlayer player)
+    public string GetDisplayText(IPlayer player, bool updateHorizontalStyle = false)
     {
         var sizeClass = MenuSizeHelper.GetSizeClass(_size);
 
@@ -69,7 +69,7 @@ public string GetDisplayText(IPlayer player)
 
             if (oldText != _cachedText && Menu != null)
             {
-                Menu.Rerender(player, true);
+                Menu.Rerender(player, false);
             }
         }
 
diff --git a/managed/src/SwiftlyS2.Core/Modules/Menus/Options/ProgressBarMenuButton.cs b/managed/src/SwiftlyS2.Core/Modules/Menus/Options/ProgressBarMenuButton.cs
@@ -22,7 +22,7 @@ internal class ProgressBarMenuOption(string text, Func<float> progressProvider,
     public bool ShouldShow(IPlayer player) => true;
     public bool CanInteract(IPlayer player) => false;
 
-    public string GetDisplayText(IPlayer player)
+    public string GetDisplayText(IPlayer player, bool updateHorizontalStyle = false)
     {
         var sizeClass = MenuSizeHelper.GetSizeClass(Size);
 
@@ -37,7 +37,7 @@ public string GetDisplayText(IPlayer player)
             bar += $"<font color='#666666'>{EmptyChar}</font>";
 
         var percentage = ShowPercentage ? $" {(int)(progress * 100)}%" : "";
-        return $"<font class='{sizeClass}'>{((Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle) ?? Text)}: {bar}{percentage}</font>";
+        return $"<font class='{sizeClass}'>{((Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle, updateHorizontalStyle) ?? Text)}: {bar}{percentage}</font>";
     }
 
     public IMenuTextSize GetTextSize()
diff --git a/managed/src/SwiftlyS2.Core/Modules/Menus/Options/SeparatorMenuButton.cs b/managed/src/SwiftlyS2.Core/Modules/Menus/Options/SeparatorMenuButton.cs
@@ -20,7 +20,7 @@ public SeparatorMenuOption()
     public bool ShouldShow(IPlayer player) => true;
     public bool CanInteract(IPlayer player) => false;
 
-    public string GetDisplayText(IPlayer player)
+    public string GetDisplayText(IPlayer player, bool updateHorizontalStyle = false)
     {
         return $"<font color='{Menu!.RenderColor.ToHex(true)}'>{Text}</font>";
     }
diff --git a/managed/src/SwiftlyS2.Core/Modules/Menus/Options/SliderMenuButton.cs b/managed/src/SwiftlyS2.Core/Modules/Menus/Options/SliderMenuButton.cs
@@ -57,7 +57,7 @@ public bool CanInteract(IPlayer player)
         return EnabledCheck?.Invoke(player) ?? true;
     }
 
-    public string GetDisplayText(IPlayer player)
+    public string GetDisplayText(IPlayer player, bool updateHorizontalStyle = false)
     {
         var sizeClass = MenuSizeHelper.GetSizeClass(Size);
 
@@ -75,7 +75,7 @@ public string GetDisplayText(IPlayer player)
         }
         slider += $"<font color='#ff3333'>)</font> {Value:F1}";
 
-        var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle) ?? Text;
+        var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle, updateHorizontalStyle) ?? Text;
         if (!CanInteract(player))
         {
             return $"<font class='{sizeClass}' color='grey'>{text}: {slider}</font>";
diff --git a/managed/src/SwiftlyS2.Core/Modules/Menus/Options/SubmenuMenuOption.cs b/managed/src/SwiftlyS2.Core/Modules/Menus/Options/SubmenuMenuOption.cs
@@ -42,7 +42,7 @@ public bool CanInteract(IPlayer player)
         return EnabledCheck?.Invoke(player) ?? true;
     }
 
-    public string GetDisplayText(IPlayer player)
+    public string GetDisplayText(IPlayer player, bool updateHorizontalStyle = false)
     {
         var sizeClass = MenuSizeHelper.GetSizeClass(Size);
 
diff --git a/managed/src/SwiftlyS2.Core/Modules/Menus/Options/TextMenuOption.cs b/managed/src/SwiftlyS2.Core/Modules/Menus/Options/TextMenuOption.cs
@@ -44,11 +44,12 @@ public bool CanInteract(IPlayer player)
         return true;
     }
 
-    public string GetDisplayText(IPlayer player)
+    public string GetDisplayText(IPlayer player, bool updateHorizontalStyle)
     {
         var text = DynamicText?.Invoke() ?? Text;
 
-        text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(text, OverflowStyle) ?? text;
+
+        text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(text, OverflowStyle, updateHorizontalStyle) ?? text;
 
         var sizeClass = MenuSizeHelper.GetSizeClass(Size);
 
diff --git a/managed/src/SwiftlyS2.Core/Modules/Menus/Options/ToggleMenuOption.cs b/managed/src/SwiftlyS2.Core/Modules/Menus/Options/ToggleMenuOption.cs
@@ -50,13 +50,13 @@ public bool CanInteract(IPlayer player)
         return EnabledCheck?.Invoke(player) ?? true;
     }
 
-    public string GetDisplayText(IPlayer player)
+    public string GetDisplayText(IPlayer player, bool updateHorizontalStyle = false)
     {
         var sizeClass = MenuSizeHelper.GetSizeClass(Size);
 
         var status = Value ? "<font color='#008000'>✔</font>" : "<font color='#FF0000'>✘</font>";
 
-        var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle) ?? Text;
+        var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle, updateHorizontalStyle) ?? Text;
         if (!CanInteract(player))
         {
             return $"<font class='{sizeClass}' color='grey'>{text}: {status}/</font>";
diff --git a/managed/src/SwiftlyS2.Shared/Modules/Menus/IMenu.cs b/managed/src/SwiftlyS2.Shared/Modules/Menus/IMenu.cs
@@ -175,8 +175,8 @@ public interface IMenu
     /// Updates the menu display with current state and options.
     /// </summary>
     /// <param name="player">The player to re-render the menu for.</param>
-    /// <param name="updateDisplayText">True to update display text, false to render without updating display text.</param>
-    public void Rerender(IPlayer player, bool updateDisplayText = false);
+    /// <param name="updateHorizontalStyle">True to update horizontal style, false to render without updating horizontal style.</param>
+    public void Rerender(IPlayer player, bool updateHorizontalStyle = false);
 
     /// <summary>
     /// Determines whether the currently selected option is selectable for the specified player.
diff --git a/managed/src/SwiftlyS2.Shared/Modules/Menus/IOption.cs b/managed/src/SwiftlyS2.Shared/Modules/Menus/IOption.cs
@@ -50,8 +50,9 @@ public interface IOption
     /// Gets the display text for this option as it should appear to the specified player.
     /// </summary>
     /// <param name="player">The player requesting the display text.</param>
+    /// <param name="updateHorizontalStyle">Indicates whether to update the horizontal style of the text.</param>
     /// <returns>The formatted display text for the option.</returns>
-    public string GetDisplayText(IPlayer player);
+    public string GetDisplayText(IPlayer player, bool updateHorizontalStyle);
 
     /// <summary>
     /// Gets the text size configuration for this option.
diff --git a/managed/src/TestPlugin/TestPlugin.cs b/managed/src/TestPlugin/TestPlugin.cs
@@ -554,6 +554,36 @@ public HookResult TestServerNetMessageHandler(CCSUsrMsg_SendPlayerItemDrops msg)
     return HookResult.Continue;
   }
 
+  [Command("i76")]
+  public void TestIssue76Command(ICommandContext context)
+  {
+      var player = context.Sender!;
+      IMenu settingsMenu = Core.Menus.CreateMenu("Settings");
+      // Add the following code to render text properly
+      //settingsMenu.Builder.AddText("123", overflowStyle: MenuHorizontalStyle.ScrollLeftLoop(25f));
+      settingsMenu.Builder.AddText("123");
+      settingsMenu.Builder.AddText("1234");
+      settingsMenu.Builder.AddText("12345");
+
+      Core.Menus.OpenMenu(player, settingsMenu);
+  }
+
+  [Command("i78")]
+  public void TestIssue78Command(ICommandContext context)
+  {
+      var player = context.Sender!;
+      IMenu settingsMenu = Core.Menus.CreateMenu("Settings");
+      settingsMenu.Builder.AddButton("123", (p) =>
+      {
+        player.SendMessage(MessageType.Chat, "Button");
+      });
+
+      settingsMenu.Builder.Design.OverrideExitButton("shift");
+      settingsMenu.Builder.Design.OverrideSelectButton("e");
+
+      Core.Menus.OpenMenu(player, settingsMenu);
+  }
+
   [Command("mt")]
   public void MenuTestCommand(ICommandContext context)
   {

Original file line number	Diff line number	Diff line change
`@@ -47,13 +47,12 @@ internal class MenuManager : IMenuManager`
`47`	`47`	`private SoundEvent _exitSound = new();`
`48`	`48`	`private SoundEvent _scrollSound = new();`
`49`	`49`
`50`		`- public MenuManager(ISwiftlyCore core)`
	`50`	`+ public MenuManager( ISwiftlyCore core )`
`51`	`51`	`{`
`52`	`52`	`_Core = core;`
`53`	`53`	`var settings = NativeEngineHelpers.GetMenuSettings();`
`54`	`54`	`var parts = settings.Split('\x01');`
`55`		`- Settings = new MenuSettings`
`56`		`- {`
	`55`	`+ Settings = new MenuSettings {`
`57`	`56`	`NavigationPrefix = parts[0],`
`58`	`57`	`InputMode = parts[1],`
`59`	`58`	`ButtonsUse = parts[2],`
`@@ -92,7 +91,7 @@ public MenuManager(ISwiftlyCore core)`
`92`	`91`	`_Core.Event.OnMapUnload -= OnMapUnload;`
`93`	`92`	`}`
`94`	`93`
`95`		`- void KeyStateChange(IOnClientKeyStateChangedEvent @event)`
	`94`	`+ void KeyStateChange( IOnClientKeyStateChangedEvent @event )`
`96`	`95`	`{`
`97`	`96`	`var player = _Core.PlayerManager.GetPlayer(@event.PlayerId);`
`98`	`97`	`var menu = GetMenu(player);`
`@@ -106,6 +105,17 @@ void KeyStateChange(IOnClientKeyStateChangedEvent @event)`
`106`	`105`	`var exitKey = menu.ButtonOverrides?.Exit ?? StringToKeyKind.GetValueOrDefault(Settings.ButtonsExit);`
`107`	`106`	`var useKey = menu.ButtonOverrides?.Select ?? StringToKeyKind.GetValueOrDefault(Settings.ButtonsUse);`
`108`	`107`
	`108`	`+ new Dictionary<string, KeyKind> { { "Scroll", scrollKey }, { "ScrollBack", scrollBackKey }, { "Exit", exitKey }, { "Use", useKey } }`
	`109`	`+ .GroupBy(kvp => kvp.Value)`
	`110`	`+ .Where(g => g.Count() > 1 && @event.Key.HasFlag(g.Key))`
	`111`	`+ .ToList()`
	`112`	`+ .ForEach(group =>`
	`113`	`+ {`
	`114`	`+ Spectre.Console.AnsiConsole.WriteException(`
	`115`	`+ new InvalidOperationException($"Duplicate key binding detected in menu '{menu.Title}': Key '{group.Key}' is used by: {string.Join(", ", group.Select(kvp => kvp.Key))}")`
	`116`	`+ );`
	`117`	`+ });`
	`118`	`+`
`109`	`119`	`if (@event.Key == scrollKey)`
`110`	`120`	`{`
`111`	`121`	`menu.MoveSelection(player, 1);`
`@@ -201,7 +211,7 @@ void KeyStateChange(IOnClientKeyStateChangedEvent @event)`
`201`	`211`	`}`
`202`	`212`	`}`
`203`	`213`
`204`		`- public void OnClientDisconnected(IOnClientDisconnectedEvent @event)`
	`214`	`+ public void OnClientDisconnected( IOnClientDisconnectedEvent @event )`
`205`	`215`	`{`
`206`	`216`	`var player = _Core.PlayerManager.GetPlayer(@event.PlayerId);`
`207`	`217`	`if (player == null)`
`@@ -221,7 +231,7 @@ public void OnClientDisconnected(IOnClientDisconnectedEvent @event)`
`221`	`231`	`}`
`222`	`232`	`}`
`223`	`233`
`224`		`- public void OnMapUnload(IOnMapUnloadEvent _)`
	`234`	`+ public void OnMapUnload( IOnMapUnloadEvent _ )`
`225`	`235`	`{`
`226`	`236`	`CloseAllMenus();`
`227`	`237`	`}`
`@@ -242,7 +252,7 @@ public void CloseAllMenus()`
`242`	`252`	`OpenMenus.Clear();`
`243`	`253`	`}`
`244`	`254`
`245`		`- public void CloseMenu(IMenu menu)`
	`255`	`+ public void CloseMenu( IMenu menu )`
`246`	`256`	`{`
`247`	`257`	`foreach (var kvp in OpenMenus)`
`248`	`258`	`{`
`@@ -256,7 +266,7 @@ public void CloseMenu(IMenu menu)`
`256`	`266`	`}`
`257`	`267`	`}`
`258`	`268`
`259`		`- public void CloseMenuByTitle(string title, bool exact = false)`
	`269`	`+ public void CloseMenuByTitle( string title, bool exact = false )`
`260`	`270`	`{`
`261`	`271`	`foreach (var kvp in OpenMenus)`
`262`	`272`	`{`
`@@ -270,7 +280,7 @@ public void CloseMenuByTitle(string title, bool exact = false)`
`270`	`280`	`}`
`271`	`281`	`}`
`272`	`282`
`273`		`- public void CloseMenuForPlayer(IPlayer player)`
	`283`	`+ public void CloseMenuForPlayer( IPlayer player )`
`274`	`284`	`{`
`275`	`285`	`if (OpenMenus.TryRemove(player, out var menu))`
`276`	`286`	`{`
`@@ -283,17 +293,17 @@ public void CloseMenuForPlayer(IPlayer player)`
`283`	`293`	`}`
`284`	`294`	`}`
`285`	`295`
`286`		`- public IMenu CreateMenu(string title)`
	`296`	`+ public IMenu CreateMenu( string title )`
`287`	`297`	`{`
`288`	`298`	`return new Menu { Title = title, MenuManager = this, MaxVisibleOptions = Settings.ItemsPerPage, _Core = _Core };`
`289`	`299`	`}`
`290`	`300`
`291`		`- public IMenu? GetMenu(IPlayer player)`
	`301`	`+ public IMenu? GetMenu( IPlayer player )`
`292`	`302`	`{`
`293`	`303`	`return OpenMenus.TryGetValue(player, out var menu) ? menu : null;`
`294`	`304`	`}`
`295`	`305`
`296`		`- public void OpenMenu(IPlayer player, IMenu menu)`
	`306`	`+ public void OpenMenu( IPlayer player, IMenu menu )`
`297`	`307`	`{`
`298`	`308`	`if (OpenMenus.TryGetValue(player, out var currentMenu))`
`299`	`309`	`{`
`@@ -306,7 +316,7 @@ public void OpenMenu(IPlayer player, IMenu menu)`
`306`	`316`	`OnMenuOpened?.Invoke(player, menu);`
`307`	`317`	`}`
`308`	`318`
`309`		`- public bool HasMenuOpen(IPlayer player)`
	`319`	`+ public bool HasMenuOpen( IPlayer player )`
`310`	`320`	`{`
`311`	`321`	`return NativePlayer.HasMenuShown(player.PlayerID);`
`312`	`322`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public bool CanInteract(IPlayer player)`
`50`	`50`	`return !IsLoading && (EnabledCheck?.Invoke(player) ?? true);`
`51`	`51`	`}`
`52`	`52`
`53`		`- public string GetDisplayText(IPlayer player)`
	`53`	`+ public string GetDisplayText(IPlayer player, bool updateHorizontalStyle = false)`
`54`	`54`	`{`
`55`	`55`	`var sizeClass = MenuSizeHelper.GetSizeClass(Size);`
`56`	`56`
`@@ -59,7 +59,7 @@ public string GetDisplayText(IPlayer player)`
`59`	`59`	`return $"<font class='{sizeClass}' color='#ffaa00'>{_loadingText ?? "Loading..."}</font>";`
`60`	`60`	`}`
`61`	`61`
`62`		`- var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle) ?? Text;`
	`62`	`+ var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle, updateHorizontalStyle) ?? Text;`
`63`	`63`	`if (!CanInteract(player))`
`64`	`64`	`{`
`65`	`65`	`return $"<font class='{sizeClass}' color='grey'>{text}</font>";`
Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,11 @@ public bool CanInteract(IPlayer player)`
`47`	`47`	`return EnabledCheck?.Invoke(player) ?? true;`
`48`	`48`	`}`
`49`	`49`
`50`		`- public string GetDisplayText(IPlayer player)`
	`50`	`+ public string GetDisplayText(IPlayer player, bool updateHorizontalStyle = false)`
`51`	`51`	`{`
`52`	`52`	`var sizeClass = MenuSizeHelper.GetSizeClass(Size);`
`53`	`53`
`54`		`- var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle) ?? Text;`
	`54`	`+ var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle, updateHorizontalStyle) ?? Text;`
`55`	`55`	`if (!CanInteract(player))`
`56`	`56`	`{`
`57`	`57`	`return $"<font class='{sizeClass}' color='grey'>{text}</font>";`
Original file line number	Diff line number	Diff line change
`@@ -67,13 +67,13 @@ public bool CanInteract(IPlayer player)`
`67`	`67`	`return EnabledCheck?.Invoke(player) ?? true;`
`68`	`68`	`}`
`69`	`69`
`70`		`- public string GetDisplayText(IPlayer player)`
	`70`	`+ public string GetDisplayText(IPlayer player, bool updateHorizontalStyle = false)`
`71`	`71`	`{`
`72`	`72`	`var sizeClass = MenuSizeHelper.GetSizeClass(Size);`
`73`	`73`
`74`	`74`	`var choice = $"<font color='{Menu!.RenderColor.ToHex(true)}'>[</font>{SelectedChoice}<font color='{Menu.RenderColor.ToHex(true)}'>]</font>";`
`75`	`75`
`76`		`- var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle) ?? Text;`
	`76`	`+ var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle, updateHorizontalStyle) ?? Text;`
`77`	`77`	`if (!CanInteract(player))`
`78`	`78`	`{`
`79`	`79`	`return $"<font class='{sizeClass}' color='grey'>{text}: {choice}</font>";`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public bool CanInteract(IPlayer player)`
`56`	`56`	`return _onClick != null && (_enabledCheck?.Invoke(player) ?? true);`
`57`	`57`	`}`
`58`	`58`
`59`		`- public string GetDisplayText(IPlayer player)`
	`59`	`+ public string GetDisplayText(IPlayer player, bool updateHorizontalStyle = false)`
`60`	`60`	`{`
`61`	`61`	`var sizeClass = MenuSizeHelper.GetSizeClass(_size);`
`62`	`62`
`@@ -69,7 +69,7 @@ public string GetDisplayText(IPlayer player)`
`69`	`69`
`70`	`70`	`if (oldText != _cachedText && Menu != null)`
`71`	`71`	`{`
`72`		`- Menu.Rerender(player, true);`
	`72`	`+ Menu.Rerender(player, false);`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ internal class ProgressBarMenuOption(string text, Func<float> progressProvider,`
`22`	`22`	`public bool ShouldShow(IPlayer player) => true;`
`23`	`23`	`public bool CanInteract(IPlayer player) => false;`
`24`	`24`
`25`		`- public string GetDisplayText(IPlayer player)`
	`25`	`+ public string GetDisplayText(IPlayer player, bool updateHorizontalStyle = false)`
`26`	`26`	`{`
`27`	`27`	`var sizeClass = MenuSizeHelper.GetSizeClass(Size);`
`28`	`28`
`@@ -37,7 +37,7 @@ public string GetDisplayText(IPlayer player)`
`37`	`37`	`bar += $"<font color='#666666'>{EmptyChar}</font>";`
`38`	`38`
`39`	`39`	`var percentage = ShowPercentage ? $" {(int)(progress * 100)}%" : "";`
`40`		`- return $"<font class='{sizeClass}'>{((Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle) ?? Text)}: {bar}{percentage}</font>";`
	`40`	`+ return $"<font class='{sizeClass}'>{((Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle, updateHorizontalStyle) ?? Text)}: {bar}{percentage}</font>";`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public IMenuTextSize GetTextSize()`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public SeparatorMenuOption()`
`20`	`20`	`public bool ShouldShow(IPlayer player) => true;`
`21`	`21`	`public bool CanInteract(IPlayer player) => false;`
`22`	`22`
`23`		`- public string GetDisplayText(IPlayer player)`
	`23`	`+ public string GetDisplayText(IPlayer player, bool updateHorizontalStyle = false)`
`24`	`24`	`{`
`25`	`25`	`return $"<font color='{Menu!.RenderColor.ToHex(true)}'>{Text}</font>";`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public bool CanInteract(IPlayer player)`
`57`	`57`	`return EnabledCheck?.Invoke(player) ?? true;`
`58`	`58`	`}`
`59`	`59`
`60`		`- public string GetDisplayText(IPlayer player)`
	`60`	`+ public string GetDisplayText(IPlayer player, bool updateHorizontalStyle = false)`
`61`	`61`	`{`
`62`	`62`	`var sizeClass = MenuSizeHelper.GetSizeClass(Size);`
`63`	`63`
`@@ -75,7 +75,7 @@ public string GetDisplayText(IPlayer player)`
`75`	`75`	`}`
`76`	`76`	`slider += $"<font color='#ff3333'>)</font> {Value:F1}";`
`77`	`77`
`78`		`- var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle) ?? Text;`
	`78`	`+ var text = (Menu as Menus.Menu)?.ApplyHorizontalStyle(Text, OverflowStyle, updateHorizontalStyle) ?? Text;`
`79`	`79`	`if (!CanInteract(player))`
`80`	`80`	`{`
`81`	`81`	`return $"<font class='{sizeClass}' color='grey'>{text}: {slider}</font>";`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public bool CanInteract(IPlayer player)`
`42`	`42`	`return EnabledCheck?.Invoke(player) ?? true;`
`43`	`43`	`}`
`44`	`44`
`45`		`- public string GetDisplayText(IPlayer player)`
	`45`	`+ public string GetDisplayText(IPlayer player, bool updateHorizontalStyle = false)`
`46`	`46`	`{`
`47`	`47`	`var sizeClass = MenuSizeHelper.GetSizeClass(Size);`
`48`	`48`