cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-09 07:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix DPI scaling messing up NanoUI windows (#38517)

Browse Source 
* add dpiScale client var and set/apply in nanoui

* thanks copilot

* add comment
This commit is contained in:
Inorien
2025-12-09 01:59:48 +09:00
committed by GitHub
parent 6d5d00b11d
commit 596bcc2799
2 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
code/modules/nano/nanoui.dm
View File

@@ -11,6 +11,12 @@ nanoui is used to open and update nano browser uis
#define STATUS_UPDATE 1 // ORANGE Visability
#define STATUS_DISABLED 0 // RED Visability
#define STATUS_CLOSE -1 // Close the window
// Post-Byond 516 DPI scaling settings affect the opened window.
// Rather than e.g. 100x100 you get (window size / scale), so for 125% scaling you get 80x80.
// This messes up a lot of interfaces so this value is cached and applied to opening windows to correct for scaling.
/client/var/dpiScale = 1
/datum/nanoui
// the user who opened this ui
var/mob/user
@@ -457,7 +463,12 @@ nanoui is used to open and update nano browser uis
var/window_size = ""
if (width && height)
window_size = "size=[width]x[height];"
var/effective_width = width
var/effective_height = height
if (user.client.dpiScale && user.client.dpiScale != 1)
effective_width = round(width * user.client.dpiScale)
effective_height = round(height * user.client.dpiScale)
window_size = "size=[effective_width]x[effective_height]"
update_status(0)
user << browse(get_html(), "window=[window_id];[window_size][window_options]")
winset(user, "mapwindow.map", "focus=true") // return keyboard focus to map
@@ -523,6 +534,20 @@ nanoui is used to open and update nano browser uis
* @return nothing
*/
/datum/nanoui/Topic(href, href_list)
if (href_list["nanoui_dpr"])
var/scale = text2num(href_list["nanoui_dpr"])
if (!scale && href_list["nanoui_inner_w"] && width)
var/inner_width = text2num(href_list["nanoui_inner_w"])
if (inner_width > 0)
scale = width / inner_width
if (scale)
if (user && user.client)
user.client.dpiScale = scale
if (user && width && height)
var/adjusted_width = round(width * scale)
var/adjusted_height = round(height * scale)
winset(user, window_id, "size=[adjusted_width]x[adjusted_height]")
update_status(0) // update the status
if (status != STATUS_INTERACTIVE || user != usr) // If UI is not interactive or usr calling Topic is not the UI user
return

28
nano/templates/layout_default.tmpl
View File

@@ -28,3 +28,31 @@
<div id='uiContent' unselectable="on">
<div id='uiLoadingNotice'>Initiating...</div>
</div>
<script type="text/javascript">
(function () {
if (window.__nanouiViewportReported) {
return;
}
window.__nanouiViewportReported = true;
var raw = document.body.getAttribute('data-url-parameters');
if (!raw) {
return;
}
try {
var params = JSON.parse(raw);
if (!params.src) {
return;
}
var query = [
"src=" + encodeURIComponent(params.src),
"nanoui_dpr=" + encodeURIComponent(window.devicePixelRatio || 1)
];
if (window.innerWidth) {
query.push("nanoui_inner_w=" + Math.round(window.innerWidth));
}
window.location.href = "byond://?" + query.join("&");
} catch (e) {
}
})();
</script>