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

clean up merge

Browse Source
This commit is contained in:
Colleague Riley 2024-07-21 11:04:23 -04:00
parent 1b5adc9462
commit 13b79164f9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/platforms/rcore_desktop_rgfw.c
View File

@ -46,7 +46,7 @@
* *
**********************************************************************************************/ **********************************************************************************************/
#ifdef GRAPHICS_API_OPENGL_ES2 #if defined(GRAPHICS_API_OPENGL_ES2)
#define RGFW_OPENGL_ES2 #define RGFW_OPENGL_ES2
#endif #endif
@ -182,7 +182,7 @@ static const unsigned short keyMappingRGFW[] = {
[RGFW_u] = KEY_U, [RGFW_u] = KEY_U,
[RGFW_v] = KEY_V, [RGFW_v] = KEY_V,
[RGFW_w] = KEY_W, [RGFW_w] = KEY_W,
[RGFW_x] KEY_X, [RGFW_x] = KEY_X,
[RGFW_y] = KEY_Y, [RGFW_y] = KEY_Y,
[RGFW_z] = KEY_Z, [RGFW_z] = KEY_Z,
[RGFW_Bracket] = KEY_LEFT_BRACKET, [RGFW_Bracket] = KEY_LEFT_BRACKET,
@ -243,7 +243,6 @@ bool WindowShouldClose(void)
// Toggle fullscreen mode // Toggle fullscreen mode
void ToggleFullscreen(void) void ToggleFullscreen(void)
{
{ {
RGFW_window_maximize(platform.window); RGFW_window_maximize(platform.window);
ToggleBorderlessWindowed(); ToggleBorderlessWindowed();
@ -537,7 +536,9 @@ void SetWindowFocused(void)
// Get native window handle // Get native window handle
void *GetWindowHandle(void) void *GetWindowHandle(void)
{ {
#ifndef RGFW_WINDOWS #ifdef RGFW_WEBASM
return (void*)platform.window->src.ctx;
#elif !defined(RGFW_WINDOWS)
return (void *)platform.window->src.window; return (void *)platform.window->src.window;
#else #else
return platform.window->src.hwnd; return platform.window->src.hwnd;
@ -572,7 +573,7 @@ int GetCurrentMonitor(void)
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
if ((mons[i].rect.x == mon.rect.x) && (mons[i].rect.y == mon.rect.y)) current = i; if ((mons[i].rect.x == mon.rect.x) && (mons[i].rect.y == mon.rect.y)) return i;
} }
return 0; return 0;