mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-27 04:08:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/uidriver/glfw: Bug fix: Wait for Restore/Maximize/Iconify finishes explicitly

Browse Source 
On Linux (and probably other UNIX OSes), glfwRestore, glfwMaximize,
and glfwIconify returns even though the window state has not changed.
Wait for its finish by a for loop and glfw.PollEvents.

Closes #1608
This commit is contained in:
Hajime Hoshi 2021-04-21 00:52:04 +09:00
parent 58572fb000
commit c7dd9a4107
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
internal/uidriver/glfw/ui.go
View File

@ -1364,6 +1364,11 @@ func (u *UserInterface) maximizeWindow() {
} }
u.window.Maximize() u.window.Maximize()
// On Linux/UNIX, maximizing might not finish even though Maximize returns. Just wait for its finish.
for u.window.GetAttrib(glfw.Maximized) != glfw.True {
glfw.PollEvents()
}
// Call setWindowSize explicitly in order to update the rendering since the callback is disabled now. // Call setWindowSize explicitly in order to update the rendering since the callback is disabled now.
// Do not call setWindowSize on the fullscreen mode since setWindowSize requires the window size // Do not call setWindowSize on the fullscreen mode since setWindowSize requires the window size
// before the fullscreen, while window.GetSize() returns the desktop screen size on the fullscreen mode. // before the fullscreen, while window.GetSize() returns the desktop screen size on the fullscreen mode.
@ -1383,6 +1388,11 @@ func (u *UserInterface) iconifyWindow() {
} }
u.window.Iconify() u.window.Iconify()
// On Linux/UNIX, iconifying might not finish even though Iconify returns. Just wait for its finish.
for u.window.GetAttrib(glfw.Iconified) != glfw.True {
glfw.PollEvents()
}
// After iconifiying, the window is invisible and setWindowSize doesn't have to be called. // After iconifiying, the window is invisible and setWindowSize doesn't have to be called.
// Rather, the window size might be (0, 0) and it might be impossible to call setWindowSize (#1585). // Rather, the window size might be (0, 0) and it might be impossible to call setWindowSize (#1585).
} }
@ -1395,8 +1405,17 @@ func (u *UserInterface) restoreWindow() {
u.setSizeCallbackEnabled = true u.setSizeCallbackEnabled = true
}() }()
} }
u.window.Restore() u.window.Restore()
// On Linux/UNIX, restoring might not finish even though Restore returns (#1608). Just wait for its finish.
// On macOS, the restoring state might be the same as the maximized state. Skip this.
if runtime.GOOS != "darwin" {
for u.window.GetAttrib(glfw.Maximized) == glfw.True || u.window.GetAttrib(glfw.Iconified) == glfw.True {
glfw.PollEvents()
}
}
// Call setWindowSize explicitly in order to update the rendering since the callback is disabled now. // Call setWindowSize explicitly in order to update the rendering since the callback is disabled now.
// Do not call setWindowSize on the fullscreen mode since setWindowSize requires the window size // Do not call setWindowSize on the fullscreen mode since setWindowSize requires the window size
// before the fullscreen, while window.GetSize() returns the desktop screen size on the fullscreen mode. // before the fullscreen, while window.GetSize() returns the desktop screen size on the fullscreen mode.