浏览代码

Fix window not resetting properly when toggling out of fullscreen, formatting

pull/5383/head
XenoMustache 3 个月前
父节点
当前提交
2380772eeb
共有 1 个文件被更改,包括 18 次插入14 次删除
  1. +18
    -14
      src/platforms/rcore_desktop_glfw.c

+ 18
- 14
src/platforms/rcore_desktop_glfw.c 查看文件

@ -265,18 +265,15 @@ void ToggleBorderlessWindowed(void)
const int monitorHeight = mode->height;
// Set screen position and size
glfwSetWindowMonitor(
platform.handle,
monitors[monitor],
monitorPosX,
monitorPosY,
monitorWidth,
monitorHeight,
mode->refreshRate
);
// glfwSetWindowPos(platform.handle, monitorPosX, monitorPosY);
// glfwSetWindowSize(platform.handle, monitorWidth, monitorHeight);
glfwSetWindowMonitor(
platform.handle,
monitors[monitor],
monitorPosX,
monitorPosY,
monitorWidth,
monitorHeight,
mode->refreshRate
);
// Refocus window
glfwFocusWindow(platform.handle);
@ -291,8 +288,15 @@ void ToggleBorderlessWindowed(void)
// Return previous screen size and position
// NOTE: The order matters here, it must set size first, then set position, otherwise the screen will be positioned incorrectly
glfwSetWindowSize(platform.handle, CORE.Window.previousScreen.width, CORE.Window.previousScreen.height);
glfwSetWindowPos(platform.handle, CORE.Window.previousPosition.x, CORE.Window.previousPosition.y);
glfwSetWindowMonitor(
platform.handle,
NULL,
CORE.Window.previousPosition.x,
CORE.Window.previousPosition.y,
CORE.Window.previousScreen.width,
CORE.Window.previousScreen.height,
mode->refreshRate
);
// Refocus window
glfwFocusWindow(platform.handle);

正在加载...
取消
保存