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 4c520581b8
commit d446aa39a9

View File

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