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

GetMonitorWidth()/GetMonitorHeight(): current video resolution instead max available

Browse Source
This commit is contained in:
Steffen Schuemann 2022-06-08 19:59:58 +02:00
parent 59a808516e
commit 5c66b39fa2
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/rcore.c
View File

@ -1723,7 +1723,7 @@ int GetCurrentMonitor(void)
#endif #endif
} }
// Get selected monitor width // Get selected monitor position
Vector2 GetMonitorPosition(int monitor) Vector2 GetMonitorPosition(int monitor)
{ {
#if defined(PLATFORM_DESKTOP) #if defined(PLATFORM_DESKTOP)
@ -1742,7 +1742,7 @@ Vector2 GetMonitorPosition(int monitor)
return (Vector2){ 0, 0 }; return (Vector2){ 0, 0 };
} }
// Get selected monitor width (max available by monitor) // Get selected monitor width (currently used by monitor)
int GetMonitorWidth(int monitor) int GetMonitorWidth(int monitor)
{ {
#if defined(PLATFORM_DESKTOP) #if defined(PLATFORM_DESKTOP)
@ -1751,11 +1751,8 @@ int GetMonitorWidth(int monitor)
if ((monitor >= 0) && (monitor < monitorCount)) if ((monitor >= 0) && (monitor < monitorCount))
{ {
int count = 0; const GLFWvidmode *mode = glfwGetVideoMode(monitors[monitor]);
const GLFWvidmode *modes = glfwGetVideoModes(monitors[monitor], &count); if(mode) return mode->width;
// We return the maximum resolution available, the last one in the modes array
if (count > 0) return modes[count - 1].width;
else TRACELOG(LOG_WARNING, "GLFW: Failed to find video mode for selected monitor"); else TRACELOG(LOG_WARNING, "GLFW: Failed to find video mode for selected monitor");
} }
else TRACELOG(LOG_WARNING, "GLFW: Failed to find selected monitor"); else TRACELOG(LOG_WARNING, "GLFW: Failed to find selected monitor");
@ -1763,7 +1760,7 @@ int GetMonitorWidth(int monitor)
return 0; return 0;
} }
// Get selected monitor width (max available by monitor) // Get selected monitor height (currently used by monitor)
int GetMonitorHeight(int monitor) int GetMonitorHeight(int monitor)
{ {
#if defined(PLATFORM_DESKTOP) #if defined(PLATFORM_DESKTOP)
@ -1772,11 +1769,8 @@ int GetMonitorHeight(int monitor)
if ((monitor >= 0) && (monitor < monitorCount)) if ((monitor >= 0) && (monitor < monitorCount))
{ {
int count = 0; const GLFWvidmode *mode = glfwGetVideoMode(monitors[monitor]);
const GLFWvidmode *modes = glfwGetVideoModes(monitors[monitor], &count); if(mode) return mode->height;
// We return the maximum resolution available, the last one in the modes array
if (count > 0) return modes[count - 1].height;
else TRACELOG(LOG_WARNING, "GLFW: Failed to find video mode for selected monitor"); else TRACELOG(LOG_WARNING, "GLFW: Failed to find video mode for selected monitor");
} }
else TRACELOG(LOG_WARNING, "GLFW: Failed to find selected monitor"); else TRACELOG(LOG_WARNING, "GLFW: Failed to find selected monitor");