MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix hardcoded canvas IDs in web targets

Browse Source
This commit is contained in:
Viktor Demčák 2026-01-23 14:27:35 +01:00
parent 77537c87a9
commit f09609f511
No known key found for this signature in database
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/platforms/rcore_web.c
View File

@ -316,15 +316,16 @@ void ToggleBorderlessWindowed(void)
// 2. The style unset handles the possibility of a width="value%" like on the default shell.html file // 2. The style unset handles the possibility of a width="value%" like on the default shell.html file
EM_ASM EM_ASM
( (
const canvasId = UTF8ToString($0);
setTimeout(function() setTimeout(function()
{ {
Module.requestFullscreen(false, true); Module.requestFullscreen(false, true);
setTimeout(function() setTimeout(function()
{ {
document.getElementById("canvas").style.width="unset"; document.querySelector(canvasId).style.width="unset";
}, 100); }, 100);
}, 100); }, 100);
); , platform.canvasId);
FLAG_SET(CORE.Window.flags, FLAG_BORDERLESS_WINDOWED_MODE); FLAG_SET(CORE.Window.flags, FLAG_BORDERLESS_WINDOWED_MODE);
} }
} }
@ -1238,9 +1239,9 @@ int InitPlatform(void)
// Avoid creating a WebGL canvas, avoid calling glfwCreateWindow() // Avoid creating a WebGL canvas, avoid calling glfwCreateWindow()
emscripten_set_canvas_element_size(platform.canvasId, CORE.Window.screen.width, CORE.Window.screen.height); emscripten_set_canvas_element_size(platform.canvasId, CORE.Window.screen.width, CORE.Window.screen.height);
EM_ASM({ EM_ASM({
const canvas = document.getElementById("canvas"); const canvas = document.querySelector(UTF8ToString($0));
Module.canvas = canvas; Module.canvas = canvas;
}); }, platform.canvasId);
// Load memory framebuffer with desired screen size // Load memory framebuffer with desired screen size
// NOTE: Despite using a software framebuffer for blitting, GLFW still creates a WebGL canvas, // NOTE: Despite using a software framebuffer for blitting, GLFW still creates a WebGL canvas,

5
src/platforms/rcore_web_emscripten.c
View File

@ -280,15 +280,16 @@ void ToggleBorderlessWindowed(void)
// 2. The style unset handles the possibility of a width="value%" like on the default shell.html file // 2. The style unset handles the possibility of a width="value%" like on the default shell.html file
EM_ASM EM_ASM
( (
const canvasId = UTF8ToString($0);
setTimeout(function() setTimeout(function()
{ {
Module.requestFullscreen(false, true); Module.requestFullscreen(false, true);
setTimeout(function() setTimeout(function()
{ {
document.getElementById("canvas").style.width="unset"; document.querySelector(canvasId).style.width="unset";
}, 100); }, 100);
}, 100); }, 100);
); , platform.canvasId);
FLAG_SET(CORE.Window.flags, FLAG_BORDERLESS_WINDOWED_MODE); FLAG_SET(CORE.Window.flags, FLAG_BORDERLESS_WINDOWED_MODE);
} }
} }