UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes GetCurrentMonitor() detection inconsistency issue (#3215)

Browse source
This commit is contained in:
ubkp 2023-08-01 05:42:50 -03:00 • committed by GitHub
parent d3ea649832
commit 4fd40f0333
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/rcore.c
View file

@ -1835,20 +1835,24 @@ int GetCurrentMonitor(void)
int mx = 0; int mx = 0;
int my = 0; int my = 0;
int width = 0;
int height = 0;
monitor = monitors[i]; monitor = monitors[i];
glfwGetMonitorWorkarea(monitor, &mx, &my, &width, &height); glfwGetMonitorPos(monitor, &mx, &my);
const GLFWvidmode *mode = glfwGetVideoMode(monitor);
if ((x >= mx) && if (mode)
(x < (mx + width)) &&
(y >= my) &&
(y < (my + height)))
{ {
index = i; const int width = mode->width;
break; const int height = mode->height;
if ((x >= mx) &&
(x < (mx + width)) &&
(y >= my) &&
(y < (my + height)))
{
index = i;
break;
}
} }
else TRACELOG(LOG_WARNING, "GLFW: Failed to find video mode for selected monitor");
} }
} }
} }