REVIEWED: PLATFORM_DESKTOP Windows building

This commit is contained in:
Ray
2023-09-19 23:59:18 +02:00
parent f27454c57a
commit 71a12171f7
7 changed files with 254 additions and 278 deletions

View File

@@ -1173,19 +1173,22 @@ void *GetWindowHandle(void)
// Get number of monitors
int GetMonitorCount(void)
{
int monitorCount;
int monitorCount = 0;
glfwGetMonitors(&monitorCount);
return monitorCount;
}
// Get number of monitors
int GetCurrentMonitor(void)
{
int index = 0;
int monitorCount;
int monitorCount = 0;
GLFWmonitor **monitors = glfwGetMonitors(&monitorCount);
GLFWmonitor *monitor = NULL;
if (monitorCount > 1)
if (monitorCount >= 1)
{
if (IsWindowFullscreen())
{
@@ -1216,6 +1219,7 @@ int GetCurrentMonitor(void)
monitor = monitors[i];
glfwGetMonitorPos(monitor, &mx, &my);
const GLFWvidmode *mode = glfwGetVideoMode(monitor);
if (mode)
{
const int width = mode->width;
@@ -1234,6 +1238,8 @@ int GetCurrentMonitor(void)
}
}
}
return index;
}
// Get selected monitor position
@@ -1256,7 +1262,7 @@ Vector2 GetMonitorPosition(int monitor)
// Get selected monitor width (currently used by monitor)
int GetMonitorWidth(int monitor)
{
int monitorCount;
int monitorCount = 0;
GLFWmonitor **monitors = glfwGetMonitors(&monitorCount);
if ((monitor >= 0) && (monitor < monitorCount))
@@ -1267,6 +1273,7 @@ int GetMonitorWidth(int monitor)
else TRACELOG(LOG_WARNING, "GLFW: Failed to find video mode for selected monitor");
}
else TRACELOG(LOG_WARNING, "GLFW: Failed to find selected monitor");
return 0;
}