diff --git a/Content.Client/GameTicking/ClientGameTicker.cs b/Content.Client/GameTicking/ClientGameTicker.cs index 94443ebdc1..5f8910baea 100644 --- a/Content.Client/GameTicking/ClientGameTicker.cs +++ b/Content.Client/GameTicking/ClientGameTicker.cs @@ -9,6 +9,7 @@ using Robust.Client; using Robust.Client.Console; using Robust.Client.Interfaces; using Robust.Client.Interfaces.Input; +using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.Interfaces.UserInterface; using Robust.Client.UserInterface; using Robust.Shared.Input; @@ -30,6 +31,7 @@ namespace Content.Client.GameTicking [Dependency] private IChatManager _chatManager; [Dependency] private IClientConsole _console; [Dependency] private ILocalizationManager _localization; + [Dependency] private IResourceCache _resourceCache; #pragma warning restore 649 [ViewVariables] private bool _areWeReady; @@ -147,7 +149,7 @@ namespace Content.Client.GameTicking _tickerState = TickerState.InLobby; - _lobby = new LobbyGui(_localization); + _lobby = new LobbyGui(_localization, _resourceCache); _userInterfaceManager.StateRoot.AddChild(_lobby); _lobby.SetAnchorAndMarginPreset(Control.LayoutPreset.Wide, margin: 20); diff --git a/Content.Client/UserInterface/LobbyGui.cs b/Content.Client/UserInterface/LobbyGui.cs index 21439f80bf..5d66c8ff1d 100644 --- a/Content.Client/UserInterface/LobbyGui.cs +++ b/Content.Client/UserInterface/LobbyGui.cs @@ -1,6 +1,6 @@ using Content.Client.Chat; using Robust.Client.Graphics.Drawing; -using Robust.Client.UserInterface; +using Robust.Client.Interfaces.ResourceManagement; using Robust.Client.UserInterface.Controls; using Robust.Shared.Localization; using Robust.Shared.Maths; @@ -16,7 +16,7 @@ namespace Content.Client.UserInterface public Button LeaveButton { get; } public ChatBox Chat { get; set; } - public LobbyGui(ILocalizationManager localization) + public LobbyGui(ILocalizationManager localization, IResourceCache resourceCache) { PanelOverride = new StyleBoxFlat { BackgroundColor = new Color(37, 37, 45)}; @@ -53,8 +53,11 @@ namespace Content.Client.UserInterface var leftVBox = new VBoxContainer {SizeFlagsHorizontal = SizeFlags.FillExpand}; hBox.AddChild(leftVBox); - // Placeholder. - leftVBox.AddChild(new Control {SizeFlagsVertical = SizeFlags.FillExpand}); + leftVBox.AddChild(new Placeholder(resourceCache) + { + SizeFlagsVertical = SizeFlags.FillExpand, + PlaceholderText = localization.GetString("Character UI\nPlaceholder") + }); var readyButtons = new HBoxContainer(); @@ -77,10 +80,15 @@ namespace Content.Client.UserInterface }); leftVBox.AddChild(Chat = new ChatBox {SizeFlagsVertical = SizeFlags.FillExpand}); + Chat.Input.PlaceHolder = localization.GetString("Talk!"); } // Placeholder. - hBox.AddChild(new Control {SizeFlagsHorizontal = SizeFlags.FillExpand}); + hBox.AddChild(new Placeholder(resourceCache) + { + SizeFlagsHorizontal = SizeFlags.FillExpand, + PlaceholderText = localization.GetString("Server Info\nPlaceholder") + }); } } }