From 78143b1ce8c313d555b9259e5507672e10b1df6c Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Thu, 26 Dec 2024 00:42:19 +0300 Subject: [PATCH] Apply typing state to holopad --- Content.Client/Holopad/HolopadSystem.cs | 2 +- Content.Server/Holopad/HolopadSystem.cs | 4 ++-- Content.Shared/Holopad/HolopadUserComponent.cs | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Content.Client/Holopad/HolopadSystem.cs b/Content.Client/Holopad/HolopadSystem.cs index 3bd556f1fc2..a4d99f9ad90 100644 --- a/Content.Client/Holopad/HolopadSystem.cs +++ b/Content.Client/Holopad/HolopadSystem.cs @@ -53,7 +53,7 @@ private void OnTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs args) if (!HasComp(uid)) return; - var netEv = new HolopadUserTypingChangedEvent(GetNetEntity(uid.Value), ev.IsTyping); + var netEv = new HolopadUserTypingChangedEvent(GetNetEntity(uid.Value), ev.State); RaiseNetworkEvent(netEv); } diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs index fce71a2cd15..7156ca2790e 100644 --- a/Content.Server/Holopad/HolopadSystem.cs +++ b/Content.Server/Holopad/HolopadSystem.cs @@ -313,7 +313,7 @@ private void OnTypingChanged(HolopadUserTypingChangedEvent ev, EntitySessionEven if (receiverHolopad.Comp.Hologram == null) continue; - _appearanceSystem.SetData(receiverHolopad.Comp.Hologram.Value.Owner, TypingIndicatorVisuals.IsTyping, ev.IsTyping); + _appearanceSystem.SetData(receiverHolopad.Comp.Hologram.Value.Owner, TypingIndicatorVisuals.State, ev.TypingState); } } } @@ -577,7 +577,7 @@ private void UnlinkHolopadFromUser(Entity entity, Entity /// The typing indicator state /// - public readonly bool IsTyping; + public readonly TypingIndicatorState TypingState; - public HolopadUserTypingChangedEvent(NetEntity user, bool isTyping) + public HolopadUserTypingChangedEvent(NetEntity user, TypingIndicatorState state) { User = user; - IsTyping = isTyping; + TypingState = state; } }