浏览代码

Fix wrong values shown for monitor width and height in pixels when fullscreen is toggled. (#1479)

This solves issue #1322 which in my opinion was prematurely closed. As the monitor resolution is expected to be the maximum that the monitor supports. My change is that as per GLFW documentation you can get all current video modes sorted by max resolution. When you toggle fullscreen the first video mode returned would be the current screen resolution setup but that doesn't help if you want to know the maximum supported.
pull/1573/head
hristo 4 年前
committed by GitHub
父节点
当前提交
6be1be4573
找不到此签名对应的密钥 GPG 密钥 ID: 4AEE18F83AFDEB23
共有 1 个文件被更改,包括 15 次插入5 次删除
  1. +15
    -5
      src/core.c

+ 15
- 5
src/core.c 查看文件

@ -1041,7 +1041,7 @@ void ToggleFullscreen(void)
glfwSetWindowMonitor(CORE.Window.handle, glfwGetPrimaryMonitor(), 0, 0, CORE.Window.screen.width, CORE.Window.screen.height, GLFW_DONT_CARE);
return;
}
const GLFWvidmode *mode = glfwGetVideoMode(monitor);
glfwSetWindowMonitor(CORE.Window.handle, monitor, 0, 0, CORE.Window.screen.width, CORE.Window.screen.height, mode->refreshRate);
@ -1537,8 +1537,13 @@ int GetMonitorWidth(int monitor)
if ((monitor >= 0) && (monitor < monitorCount))
{
const GLFWvidmode *mode = glfwGetVideoMode(monitors[monitor]);
return mode->width;
int count = 0;
const GLFWvidmode *modes = glfwGetVideoModes(monitors[monitor], &count);
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 selected monitor");
#endif
@ -1554,8 +1559,13 @@ int GetMonitorHeight(int monitor)
if ((monitor >= 0) && (monitor < monitorCount))
{
const GLFWvidmode *mode = glfwGetVideoMode(monitors[monitor]);
return mode->height;
int count = 0;
const GLFWvidmode *modes = glfwGetVideoModes(monitors[monitor], &count);
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 selected monitor");
#endif

正在加载...
取消
保存