internal/uidriver/glfw: Bug fix: Always wait for SetFramebuffer

In case when the callback is not called, let's use timeout.

Updates #1618
This commit is contained in:
Hajime Hoshi 2021-04-23 03:02:06 +09:00
parent ed62bffff1
commit b726d19b00

View File

@ -1208,15 +1208,22 @@ func (u *UserInterface) setWindowSize(width, height int, fullscreen bool) {
ch <- struct{}{} ch <- struct{}{}
}) })
u.window.SetSize(newW, newH) u.window.SetSize(newW, newH)
if w, h := u.window.GetSize(); w != oldW || h != oldH { // Just after SetSize, GetSize is not reliable especially on Linux/Windows.
event: // Let's wait for FramebufferSize callback in any cases.
for {
glfw.PollEvents() // Use the timeout as FramebufferSize event might not be fired (#1618).
select { t := time.NewTimer(time.Second)
case <-ch: defer t.Stop()
break event
default: event:
} for {
glfw.PollEvents()
select {
case <-ch:
break event
case <-t.C:
break event
default:
} }
} }
u.window.SetFramebufferSizeCallback(nil) u.window.SetFramebufferSizeCallback(nil)