mirrors/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-09-23 11:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a current monitor function for window mode windows. (#1492)

Browse Source
This commit is contained in:
Jeffery Myers
2020-12-30 08:29:39 -08:00
committed by GitHub
parent 24b6dcf29f
commit 4c8bebc0d7
1 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/core.c
View File

@@ -1458,14 +1458,43 @@ int GetCurrentMonitor(void)
#if defined(PLATFORM_DESKTOP) #if defined(PLATFORM_DESKTOP)
int monitorCount; int monitorCount;
GLFWmonitor** monitors = glfwGetMonitors(&monitorCount); GLFWmonitor** monitors = glfwGetMonitors(&monitorCount);
GLFWmonitor* monitor = NULL;
GLFWmonitor* monitor = glfwGetWindowMonitor(CORE.Window.handle); if (monitorCount == 1) // easy out
return 0;
if (IsWindowFullscreen())
{
monitor = glfwGetWindowMonitor(CORE.Window.handle);
for (int i = 0; i < monitorCount; i++) for (int i = 0; i < monitorCount; i++)
{ {
if (monitors[i] == monitor) if (monitors[i] == monitor)
return i; return i;
} }
return 0; return 0;
}
else
{
int x = 0;
int y = 0;
glfwGetWindowPos(CORE.Window.handle, &x, &y);
for (int i = 0; i < monitorCount; i++)
{
int mx = 0;
int my = 0;
int width = 0;
int height = 0;
monitor = monitors[i];
glfwGetMonitorWorkarea(monitor, &mx, &my, &width, &height);
if (x >= mx && x <= (mx + width) && y >= my && y <= (my + height))
return i;
}
}
return 0;
#else #else
return 0; return 0;
#endif #endif