diff --git a/Content.Client/Administration/Managers/ClientAdminManager.cs b/Content.Client/Administration/Managers/ClientAdminManager.cs index d33761be8f2..fdd62fb6a2d 100644 --- a/Content.Client/Administration/Managers/ClientAdminManager.cs +++ b/Content.Client/Administration/Managers/ClientAdminManager.cs @@ -2,6 +2,7 @@ using Content.Shared.Administration.Managers; using Robust.Client.Console; using Robust.Client.Player; +using Robust.Client.UserInterface; using Robust.Shared.ContentPack; using Robust.Shared.Network; using Robust.Shared.Player; @@ -16,6 +17,7 @@ public sealed class ClientAdminManager : IClientAdminManager, IClientConGroupImp [Dependency] private readonly IClientConGroupController _conGroup = default!; [Dependency] private readonly IResourceManager _res = default!; [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private readonly IUserInterfaceManager _userInterface = default!; private AdminData? _adminData; private readonly HashSet _availableCommands = new(); @@ -101,6 +103,9 @@ private void UpdateMessageRx(MsgUpdateAdminStatus message) { var flagsText = string.Join("|", AdminFlagsHelper.FlagsToNames(_adminData.Flags)); _sawmill.Info($"Updated admin status: {_adminData.Active}/{_adminData.Title}/{flagsText}"); + + if (_adminData.Active) + _userInterface.DebugMonitors.SetMonitor(DebugMonitor.Coords, true); } else { diff --git a/Content.Client/Labels/EntitySystems/LabelSystem.cs b/Content.Client/Labels/EntitySystems/LabelSystem.cs new file mode 100644 index 00000000000..baa9f7fee72 --- /dev/null +++ b/Content.Client/Labels/EntitySystems/LabelSystem.cs @@ -0,0 +1,7 @@ +using Content.Shared.Labels.EntitySystems; + +namespace Content.Client.Labels; + +public sealed partial class LabelSystem : SharedLabelSystem +{ +} diff --git a/Content.Client/Paper/UI/PaperBoundUserInterface.cs b/Content.Client/Paper/UI/PaperBoundUserInterface.cs index 6b12cfe3a71..4b0ac868f01 100644 --- a/Content.Client/Paper/UI/PaperBoundUserInterface.cs +++ b/Content.Client/Paper/UI/PaperBoundUserInterface.cs @@ -1,6 +1,5 @@ using JetBrains.Annotations; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Input; using Robust.Shared.Utility; using static Content.Shared.Paper.SharedPaperComponent; @@ -22,15 +21,7 @@ protected override void Open() _window = new PaperWindow(); _window.OnClose += Close; - _window.Input.OnKeyBindDown += args => // Solution while TextEdit don't have events - { - if (args.Function == EngineKeyFunctions.MultilineTextSubmit) - { - var text = Rope.Collapse(_window.Input.TextRope); - Input_OnTextEntered(text); - args.Handle(); - } - }; + _window.OnSaved += Input_OnTextEntered; if (EntMan.TryGetComponent(Owner, out var visuals)) { diff --git a/Content.Client/Paper/UI/PaperWindow.xaml b/Content.Client/Paper/UI/PaperWindow.xaml index 279dd72b272..2344afd5ef7 100644 --- a/Content.Client/Paper/UI/PaperWindow.xaml +++ b/Content.Client/Paper/UI/PaperWindow.xaml @@ -25,5 +25,9 @@ + + +