|
|
@ -2410,16 +2410,21 @@ void _glfwPlatformSetWindowMonitor(_GLFWwindow* window, |
|
|
|
|
|
|
|
|
|
|
|
_glfwInputWindowMonitor(window, monitor); |
|
|
|
_glfwInputWindowMonitor(window, monitor); |
|
|
|
updateNormalHints(window, width, height); |
|
|
|
updateNormalHints(window, width, height); |
|
|
|
updateWindowMode(window); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (window->monitor) |
|
|
|
if (window->monitor) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
if (!_glfwPlatformWindowVisible(window)) |
|
|
|
{ |
|
|
|
{ |
|
|
|
XMapRaised(_glfw.x11.display, window->x11.handle); |
|
|
|
XMapRaised(_glfw.x11.display, window->x11.handle); |
|
|
|
if (waitForVisibilityNotify(window)) |
|
|
|
waitForVisibilityNotify(window); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
updateWindowMode(window); |
|
|
|
acquireMonitor(window); |
|
|
|
acquireMonitor(window); |
|
|
|
} |
|
|
|
} |
|
|
|
else |
|
|
|
else |
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
updateWindowMode(window); |
|
|
|
XMoveResizeWindow(_glfw.x11.display, window->x11.handle, |
|
|
|
XMoveResizeWindow(_glfw.x11.display, window->x11.handle, |
|
|
|
xpos, ypos, width, height); |
|
|
|
xpos, ypos, width, height); |
|
|
|
} |
|
|
|
} |
|
|
|