diff --git a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs index 95d5cc7ab32..8cab1a42664 100644 --- a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs +++ b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs @@ -32,10 +32,10 @@ namespace Content.Client.Labels.UI } _window.OnLabelChanged += OnLabelChanged; + _window.OnLabelSelected += OnLabelSelected; // Starlight Reload(); _window.SetInitialLabelState(); // Must be after Reload() has set the label text } - private void OnLabelChanged(string newLabel) { // Focus moment @@ -45,7 +45,17 @@ namespace Content.Client.Labels.UI SendPredictedMessage(new HandLabelerLabelChangedMessage(newLabel)); } - + // Starlight start + private void OnLabelSelected(string label) + { + // Update UI and send message to sync with server + if (_window != null) + { + _window.SetCurrentLabel(label); + } + SendPredictedMessage(new HandLabelerLabelChangedMessage(label)); + } + // Starlight End public void Reload() { if (_window == null || !_entManager.TryGetComponent(Owner, out HandLabelerComponent? component)) diff --git a/Content.Client/Labels/UI/HandLabelerWindow.xaml b/Content.Client/Labels/UI/HandLabelerWindow.xaml index 7bbadb843d6..4a00420aeef 100644 --- a/Content.Client/Labels/UI/HandLabelerWindow.xaml +++ b/Content.Client/Labels/UI/HandLabelerWindow.xaml @@ -1,8 +1,10 @@ + MinWidth="150" + SetHeight="400">