tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up TitleWindowManager.cs (#36327)

Browse Source 
* Clean up TitleWindowManager.cs

- I did not like how `OnHostnameChange()` always needed a string even though that string would always just be the hostname, so now it's just part of its function
- The extra function made to just trigger `OnHostnameChange()` are removed. It just runs the right function off the bat.
- Checking for `ClientRunLevel.InGame` for setting the title without the hostname, which means the previous joined server won't appear for a split second before being corrected by the new cvars being set. Or if the server prefers no host name in the titlebar by the time we connect.

* review

* Sus
This commit is contained in:
Myra
2025-10-15 00:13:32 +02:00
committed by GitHub
parent d81fba01ce
commit 1a5be55c70
2 changed files with 13 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/Entry/EntryPoint.cs
View File

@@ -151,12 +151,6 @@ namespace Content.Client.Entry
_configManager.SetCVar("interface.resolutionAutoScaleMinimum", 0.5f); _configManager.SetCVar("interface.resolutionAutoScaleMinimum", 0.5f);
} }
public override void Shutdown()
{
base.Shutdown();
_titleWindowManager.Shutdown();
}
public override void PostInit() public override void PostInit()
{ {
base.PostInit(); base.PostInit();

45
Content.Client/GameTicking/Managers/TitleWindowManager.cs
View File

@@ -15,48 +15,29 @@ public sealed class TitleWindowManager
public void Initialize() public void Initialize()
{ {
_cfg.OnValueChanged(CVars.GameHostName, OnHostnameChange, true); _cfg.OnValueChanged(CVars.GameHostName, _ => OnHostnameChange(), true);
_cfg.OnValueChanged(CCVars.GameHostnameInTitlebar, OnHostnameTitleChange, true); _cfg.OnValueChanged(CCVars.GameHostnameInTitlebar, _ => OnHostnameChange(), true);
_client.RunLevelChanged += OnRunLevelChangedChange; _client.RunLevelChanged += (_, _) => OnHostnameChange();
} }
public void Shutdown() private void OnHostnameChange()
{
_cfg.UnsubValueChanged(CVars.GameHostName, OnHostnameChange);
_cfg.UnsubValueChanged(CCVars.GameHostnameInTitlebar, OnHostnameTitleChange);
}
private void OnHostnameChange(string hostname)
{ {
var defaultWindowTitle = _gameController.GameTitle(); var defaultWindowTitle = _gameController.GameTitle();
// Since the game assumes the server name is MyServer and that GameHostnameInTitlebar CCVar is true by default // When the client starts connecting, it will be using either the default hostname, or whatever hostname
// Lets just... not show anything. This also is used to revert back to just the game title on disconnect. // is set in its config file (aka the last server they connected to) until it receives the latest cvars.
if (_client.RunLevel == ClientRunLevel.Initialize) // If they are not connected then we will not show anything other than the usual window title.
if (_client.RunLevel != ClientRunLevel.InGame)
{ {
_clyde.SetWindowTitle(defaultWindowTitle); _clyde.SetWindowTitle(defaultWindowTitle);
return; return;
} }
if (_cfg.GetCVar(CCVars.GameHostnameInTitlebar)) _clyde.SetWindowTitle(
// If you really dislike the dash I guess change it here _cfg.GetCVar(CCVars.GameHostnameInTitlebar)
_clyde.SetWindowTitle(hostname + " - " + defaultWindowTitle); ? _cfg.GetCVar(CVars.GameHostName) + " - " + defaultWindowTitle
else : defaultWindowTitle);
_clyde.SetWindowTitle(defaultWindowTitle);
}
// Clients by default assume game.hostname_in_titlebar is true
// but we need to clear it as soon as we join and actually receive the servers preference on this.
// This will ensure we rerun OnHostnameChange and set the correct title bar name.
private void OnHostnameTitleChange(bool colonthree)
{
OnHostnameChange(_cfg.GetCVar(CVars.GameHostName));
}
// This is just used we can rerun the hostname change function when we disconnect to revert back to just the games title.
private void OnRunLevelChangedChange(object? sender, RunLevelChangedEventArgs runLevelChangedEventArgs)
{
OnHostnameChange(_cfg.GetCVar(CVars.GameHostName));
} }
// You thought I would remove the :3 from this code? You were wrong.
} }