Skip to content

Commit 1f6de0c

Browse files
authored
Replacing hardcoded canvas id references with module variable usages (#4735)
Should also have the benefit of being faster.
1 parent d46ba9a commit 1f6de0c

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/platforms/rcore_web.c

+11-11
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ void ToggleFullscreen(void)
185185
else if (CORE.Window.flags & FLAG_BORDERLESS_WINDOWED_MODE) enterFullscreen = true;
186186
else
187187
{
188-
const int canvasWidth = EM_ASM_INT( { return document.getElementById('canvas').width; }, 0);
189-
const int canvasStyleWidth = EM_ASM_INT( { return parseInt(document.getElementById('canvas').style.width); }, 0);
188+
const int canvasWidth = EM_ASM_INT( { return Module.canvas.width; }, 0);
189+
const int canvasStyleWidth = EM_ASM_INT( { return parseInt(Module.canvas.style.width); }, 0);
190190
if (canvasStyleWidth > canvasWidth) enterFullscreen = false;
191191
else enterFullscreen = true;
192192
}
@@ -293,7 +293,7 @@ void ToggleBorderlessWindowed(void)
293293
else if (CORE.Window.flags & FLAG_FULLSCREEN_MODE) enterBorderless = true;
294294
else
295295
{
296-
const int canvasWidth = EM_ASM_INT( { return document.getElementById('canvas').width; }, 0);
296+
const int canvasWidth = EM_ASM_INT( { return Module.canvas.width; }, 0);
297297
const int screenWidth = EM_ASM_INT( { return screen.width; }, 0);
298298
if (screenWidth == canvasWidth) enterBorderless = false;
299299
else enterBorderless = true;
@@ -379,8 +379,8 @@ void SetWindowState(unsigned int flags)
379379
const bool wasFullscreen = EM_ASM_INT( { if (document.fullscreenElement) return 1; }, 0);
380380
if (wasFullscreen)
381381
{
382-
const int canvasWidth = EM_ASM_INT( { return document.getElementById('canvas').width; }, 0);
383-
const int canvasStyleWidth = EM_ASM_INT( { return parseInt(document.getElementById('canvas').style.width); }, 0);
382+
const int canvasWidth = EM_ASM_INT( { return Module.canvas.width; }, 0);
383+
const int canvasStyleWidth = EM_ASM_INT( { return parseInt(Module.canvas.style.width); }, 0);
384384
if ((CORE.Window.flags & FLAG_FULLSCREEN_MODE) || canvasStyleWidth > canvasWidth) ToggleBorderlessWindowed();
385385
}
386386
else ToggleBorderlessWindowed();
@@ -393,7 +393,7 @@ void SetWindowState(unsigned int flags)
393393
const bool wasFullscreen = EM_ASM_INT( { if (document.fullscreenElement) return 1; }, 0);
394394
if (wasFullscreen)
395395
{
396-
const int canvasWidth = EM_ASM_INT( { return document.getElementById('canvas').width; }, 0);
396+
const int canvasWidth = EM_ASM_INT( { return Module.canvas.width; }, 0);
397397
const int screenWidth = EM_ASM_INT( { return screen.width; }, 0);
398398
if ((CORE.Window.flags & FLAG_BORDERLESS_WINDOWED_MODE) || screenWidth == canvasWidth ) ToggleFullscreen();
399399
}
@@ -512,7 +512,7 @@ void ClearWindowState(unsigned int flags)
512512
const bool wasFullscreen = EM_ASM_INT( { if (document.fullscreenElement) return 1; }, 0);
513513
if (wasFullscreen)
514514
{
515-
const int canvasWidth = EM_ASM_INT( { return document.getElementById('canvas').width; }, 0);
515+
const int canvasWidth = EM_ASM_INT( { return Module.canvas.width; }, 0);
516516
const int screenWidth = EM_ASM_INT( { return screen.width; }, 0);
517517
if ((CORE.Window.flags & FLAG_BORDERLESS_WINDOWED_MODE) || (screenWidth == canvasWidth)) EM_ASM(document.exitFullscreen(););
518518
}
@@ -526,8 +526,8 @@ void ClearWindowState(unsigned int flags)
526526
const bool wasFullscreen = EM_ASM_INT( { if (document.fullscreenElement) return 1; }, 0);
527527
if (wasFullscreen)
528528
{
529-
const int canvasWidth = EM_ASM_INT( { return document.getElementById('canvas').width; }, 0);
530-
const int canvasStyleWidth = EM_ASM_INT( { return parseInt(document.getElementById('canvas').style.width); }, 0);
529+
const int canvasWidth = EM_ASM_INT( { return Module.canvas.width; }, 0);
530+
const int canvasStyleWidth = EM_ASM_INT( { return parseInt(Module.canvas.style.width); }, 0);
531531
if ((CORE.Window.flags & FLAG_FULLSCREEN_MODE) || (canvasStyleWidth > canvasWidth)) EM_ASM(document.exitFullscreen(););
532532
}
533533

@@ -685,7 +685,7 @@ void SetWindowOpacity(float opacity)
685685
{
686686
if (opacity >= 1.0f) opacity = 1.0f;
687687
else if (opacity <= 0.0f) opacity = 0.0f;
688-
EM_ASM({ document.getElementById('canvas').style.opacity = $0; }, opacity);
688+
EM_ASM({ Module.canvas.style.opacity = $0; }, opacity);
689689
}
690690

691691
// Set window focused
@@ -962,7 +962,7 @@ void SetMouseCursor(int cursor)
962962
{
963963
if (CORE.Input.Mouse.cursor != cursor)
964964
{
965-
if (!CORE.Input.Mouse.cursorHidden) EM_ASM( { document.getElementById('canvas').style.cursor = UTF8ToString($0); }, cursorLUT[cursor]);
965+
if (!CORE.Input.Mouse.cursorHidden) EM_ASM( { Module.canvas.style.cursor = UTF8ToString($0); }, cursorLUT[cursor]);
966966

967967
CORE.Input.Mouse.cursor = cursor;
968968
}

0 commit comments

Comments
 (0)