diff --git a/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs b/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs index b3f0eb1689..e2a763c14b 100644 --- a/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs +++ b/Content.Client/_DV/AACTablet/UI/AACBoundUserInterface.cs @@ -7,7 +7,7 @@ using Robust.Shared.Prototypes; namespace Content.Client._DV.AACTablet.UI; -public sealed class AACBoundUserInterface : BoundUserInterface +public sealed partial class AACBoundUserInterface : BoundUserInterface // starcup: made partial { [ViewVariables] private AACWindow? _window; @@ -23,16 +23,20 @@ public sealed class AACBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - _window?.Close(); + + if (_window is { Disposed: false }) + _window.Close(); + _window = this.CreateWindow(); + _window.OnClose += Close; _window.PhraseButtonPressed += OnPhraseButtonPressed; _window.Typing += OnTyping; _window.SubmitPressed += OnSubmit; } - private void OnPhraseButtonPressed(List> phraseId) + private void OnPhraseButtonPressed(List> phraseId, string prefix) { - SendMessage(new AACTabletSendPhraseMessage(phraseId)); + SendMessage(new AACTabletSendPhraseMessage(phraseId, prefix)); // starcup: prefix parameter } private void OnTyping() diff --git a/Content.Client/_DV/AACTablet/UI/AACWindow.xaml b/Content.Client/_DV/AACTablet/UI/AACWindow.xaml index f845c71343..2ad8c45ae3 100644 --- a/Content.Client/_DV/AACTablet/UI/AACWindow.xaml +++ b/Content.Client/_DV/AACTablet/UI/AACWindow.xaml @@ -18,7 +18,14 @@ StyleClasses="AacCheckbox" Margin="0 0 8 0"/> - + + + + + @@ -29,7 +36,6 @@ StyleClasses="AacBufferText" Margin="8 4"/> -