From 3fca5f821697bdf5bf34a399d021eddc617d0e32 Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Thu, 27 Mar 2025 03:31:43 -0400 Subject: [PATCH] [516] Scaling and TGUI fixes (#28809) * [516] Scaling and TGUI fixes * fuck it we go with this * ??? * final changes * whoops --- code/datums/browser.dm | 13 +++++++++++++ code/datums/datumvars.dm | 5 ++++- code/modules/client/client_defines.dm | 3 +++ code/modules/client/client_procs.dm | 11 +++++++++++ tgui/packages/tgui-say/TguiSay.tsx | 2 ++ tgui/packages/tgui-say/helpers.ts | 7 ++++++- tgui/packages/tgui/components/Input.js | 1 + tgui/packages/tgui/drag.js | 1 + tgui/public/tgui-panel.bundle.js | 4 ++-- tgui/public/tgui-say.bundle.js | 4 ++-- tgui/public/tgui.bundle.js | 4 ++-- 11 files changed, 47 insertions(+), 8 deletions(-) diff --git a/code/datums/browser.dm b/code/datums/browser.dm index e48861f533f..24f84f497eb 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -86,6 +86,15 @@ for(var/file in scripts) head_content += "" + if(user.client.window_scaling && user.client.window_scaling != 1) + head_content += {" + + "} + return {" @@ -122,6 +131,10 @@ var/window_size = "" if(width && height) window_size = "size=[width]x[height];" + if(user?.client?.window_scaling) + window_size = "size=[width * user.client.window_scaling]x[height * user.client.window_scaling];" + else + window_size = "size=[width]x[height];" if(include_default_stylesheet) var/datum/asset/simple/common/common_asset = get_asset_datum(/datum/asset/simple/common) common_asset.send(user) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 94209ec4fc2..ef284149ddb 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -255,6 +255,7 @@ [title] + [window_scaling ? "" : ""]