From 8adf4606d71aa946b6df423502960f35518a08b5 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Sun, 17 Oct 2021 23:04:24 -0300 Subject: [PATCH] closes #15279 --- code/modules/mob/say.dm | 10 ++++++++++ tgui/packages/tgui/interfaces/InputModal.js | 6 ++++-- tgui/packages/tgui/layouts/Window.js | 3 ++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index d332aa56c2..d41f59d104 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -5,6 +5,11 @@ set hidden = TRUE set category = "IC" client?.last_activity = world.time + for(var/datum/tgui/window in tgui_open_uis) + if(istype(window.src_object, /datum/tgui_input_dialog)) + var/datum/tgui_input_dialog/say_box = window.src_object + if(say_box.title == "say") // Yes, i am dead serious. + return display_typing_indicator() var/message = tgui_input_text(usr, null, "say") // If they don't type anything just drop the message. @@ -32,6 +37,11 @@ set hidden = TRUE set category = "IC" client?.last_activity = world.time + for(var/datum/tgui/window in tgui_open_uis) + if(istype(window.src_object, /datum/tgui_input_dialog)) + var/datum/tgui_input_dialog/emote_box = window.src_object + if(emote_box.title == "me") // Yes, i am dead serious. + return display_typing_indicator() var/message = tgui_input_message(usr, null, "me") // If they don't type anything just drop the message. diff --git a/tgui/packages/tgui/interfaces/InputModal.js b/tgui/packages/tgui/interfaces/InputModal.js index 2e8308e8f9..1818abccda 100644 --- a/tgui/packages/tgui/interfaces/InputModal.js +++ b/tgui/packages/tgui/interfaces/InputModal.js @@ -28,13 +28,14 @@ export const InputModal = (props, context) => { } }; - let initialHeight, initialWidth; + let initialHeight, initialWidth, canResize; let modalBody; switch (input_type) { case 'text': case 'num': initialWidth = 325; initialHeight = message ? Math.max(150, message.length) : 110; + canResize = false; modalBody = ( { case 'message': initialWidth = 450; initialHeight = 350; + canResize = true; modalBody = (