From 544fd135de7f2abed15b6a684c9b7766ff85ad8b Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Date: Sun, 16 Jun 2024 15:38:10 -0700 Subject: [PATCH] Default to Separated UI Layout (#433) # Description ~~Change from Nyano~~ Uses space a lot better. The old layout still exists if people want it for whatever reason. I also renamed "Default" to "Overlay", which should stay anyway if the default change is denied. ---

Media

## Separated ![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/b97c4373-99ac-4ac5-80a5-149122238551) ## Overlay ![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/3891756f-91f0-4336-b075-6c461ee1b8e6)

--- # Changelog :cl: - tweak: UI layout now defaults to separated, the old one is still available in settings --- Content.Client/Gameplay/GameplayState.cs | 8 ++++---- ...ameScreen.xaml => OverlayChatGameScreen.xaml} | 4 ++-- ...een.xaml.cs => OverlayChatGameScreen.xaml.cs} | 4 ++-- .../UserInterface/Screens/ScreenType.cs | 8 ++++---- .../Systems/Chat/ChatUIController.cs | 16 ++++++++-------- .../Systems/Vote/VoteUIController.cs | 6 +++--- Content.Shared/CCVar/CCVars.cs | 6 +++--- 7 files changed, 26 insertions(+), 26 deletions(-) rename Content.Client/UserInterface/Screens/{DefaultGameScreen.xaml => OverlayChatGameScreen.xaml} (96%) rename Content.Client/UserInterface/Screens/{DefaultGameScreen.xaml.cs => OverlayChatGameScreen.xaml.cs} (94%) diff --git a/Content.Client/Gameplay/GameplayState.cs b/Content.Client/Gameplay/GameplayState.cs index 1efee978f39..2ea16521e8f 100644 --- a/Content.Client/Gameplay/GameplayState.cs +++ b/Content.Client/Gameplay/GameplayState.cs @@ -93,17 +93,17 @@ private void LoadMainScreen() var screenTypeString = _configurationManager.GetCVar(CCVars.UILayout); if (!Enum.TryParse(screenTypeString, out ScreenType screenType)) { - screenType = default; + screenType = ScreenType.Separated; } switch (screenType) { - case ScreenType.Default: - _uiManager.LoadScreen(); - break; case ScreenType.Separated: _uiManager.LoadScreen(); break; + case ScreenType.Overlay: + _uiManager.LoadScreen(); + break; } _loadController.LoadScreen(); diff --git a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml b/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml similarity index 96% rename from Content.Client/UserInterface/Screens/DefaultGameScreen.xaml rename to Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml index 54aeffe72c9..4ba820b3392 100644 --- a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml +++ b/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml @@ -1,4 +1,4 @@ - - + diff --git a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs b/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml.cs similarity index 94% rename from Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs rename to Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml.cs index 0fb1b7d507f..c45ec9d4a02 100644 --- a/Content.Client/UserInterface/Screens/DefaultGameScreen.xaml.cs +++ b/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml.cs @@ -6,9 +6,9 @@ namespace Content.Client.UserInterface.Screens; [GenerateTypedNameReferences] -public sealed partial class DefaultGameScreen : InGameScreen +public sealed partial class OverlayChatGameScreen : InGameScreen { - public DefaultGameScreen() + public OverlayChatGameScreen() { RobustXamlLoader.Load(this); diff --git a/Content.Client/UserInterface/Screens/ScreenType.cs b/Content.Client/UserInterface/Screens/ScreenType.cs index 595dc79556d..039cd7b1287 100644 --- a/Content.Client/UserInterface/Screens/ScreenType.cs +++ b/Content.Client/UserInterface/Screens/ScreenType.cs @@ -3,11 +3,11 @@ namespace Content.Client.UserInterface.Screens; public enum ScreenType { /// - /// The modern SS14 user interface. + /// The classic SS13 user interface. /// - Default, + Separated, /// - /// The classic SS13 user interface. + /// The temporary SS14 user interface. /// - Separated + Overlay, } diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs index 0ad78f974e5..a12511e97c3 100644 --- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs +++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs @@ -264,16 +264,16 @@ public void SetMainChat(bool setting) switch (UIManager.ActiveScreen) { - case DefaultGameScreen defaultScreen: - chatBox = defaultScreen.ChatBox; - chatSizeRaw = _config.GetCVar(CCVars.DefaultScreenChatSize); - SetChatSizing(chatSizeRaw, defaultScreen, setting); - break; case SeparatedChatGameScreen separatedScreen: chatBox = separatedScreen.ChatBox; chatSizeRaw = _config.GetCVar(CCVars.SeparatedScreenChatSize); SetChatSizing(chatSizeRaw, separatedScreen, setting); break; + case OverlayChatGameScreen overlayScreen: + chatBox = overlayScreen.ChatBox; + chatSizeRaw = _config.GetCVar(CCVars.OverlayScreenChatSize); + SetChatSizing(chatSizeRaw, overlayScreen, setting); + break; default: // this could be better? var maybeChat = UIManager.ActiveScreen.GetWidget(); @@ -322,12 +322,12 @@ private void StoreChatSize(Vector2 size) $"{size.X.ToString(CultureInfo.InvariantCulture)},{size.Y.ToString(CultureInfo.InvariantCulture)}"; switch (UIManager.ActiveScreen) { - case DefaultGameScreen _: - _config.SetCVar(CCVars.DefaultScreenChatSize, stringSize); - break; case SeparatedChatGameScreen _: _config.SetCVar(CCVars.SeparatedScreenChatSize, stringSize); break; + case OverlayChatGameScreen _: + _config.SetCVar(CCVars.OverlayScreenChatSize, stringSize); + break; default: // do nothing return; diff --git a/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs b/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs index 52d0348b798..ac37cebfa99 100644 --- a/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs +++ b/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs @@ -23,12 +23,12 @@ private void OnScreenLoad() { switch (UIManager.ActiveScreen) { - case DefaultGameScreen game: - _votes.SetPopupContainer(game.VoteMenu); - break; case SeparatedChatGameScreen separated: _votes.SetPopupContainer(separated.VoteMenu); break; + case OverlayChatGameScreen overlay: + _votes.SetPopupContainer(overlay.VoteMenu); + break; } } diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index f8943a9bf90..891c790d52c 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1596,10 +1596,10 @@ public static readonly CVarDef */ public static readonly CVarDef UILayout = - CVarDef.Create("ui.layout", "Default", CVar.CLIENTONLY | CVar.ARCHIVE); + CVarDef.Create("ui.layout", "Separated", CVar.CLIENTONLY | CVar.ARCHIVE); - public static readonly CVarDef DefaultScreenChatSize = - CVarDef.Create("ui.default_chat_size", "", CVar.CLIENTONLY | CVar.ARCHIVE); + public static readonly CVarDef OverlayScreenChatSize = + CVarDef.Create("ui.overlay_chat_size", "", CVar.CLIENTONLY | CVar.ARCHIVE); public static readonly CVarDef SeparatedScreenChatSize = CVarDef.Create("ui.separated_chat_size", "0.6,0", CVar.CLIENTONLY | CVar.ARCHIVE);