mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-13 12:32:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/uidriver/glfw: bug fix: a callback must be registered at createWindow

Browse Source
This commit is contained in:
Hajime Hoshi 2022-02-03 01:00:05 +09:00
parent 80f178b5e8
commit 9999b65261
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -711,6 +711,7 @@ func (u *UserInterface) createWindow() error {
u.registerWindowSetSizeCallback() u.registerWindowSetSizeCallback()
u.registerWindowCloseCallback() u.registerWindowCloseCallback()
u.registerWindowFramebufferSizeCallback()
return nil return nil
} }
@ -782,6 +783,28 @@ func (u *UserInterface) registerWindowCloseCallback() {
u.window.SetCloseCallback(u.closeCallback) u.window.SetCloseCallback(u.closeCallback)
} }
// registerWindowFramebufferSizeCallback must be called from the main thread.
func (u *UserInterface) registerWindowFramebufferSizeCallback() {
if u.defaultFramebufferSizeCallback == 0 {
// When the window gets resized (either by manual window resize or a window
// manager), glfw sends a framebuffer size callback which we need to handle (#1960).
// This event is the only way to handle the size change at least on i3 window manager.
u.defaultFramebufferSizeCallback = glfw.ToFramebufferSizeCallback(func(_ *glfw.Window, w, h int) {
if u.isFullscreen() {
return
}
// The framebuffer size is always scaled by the device scale factor (#1975).
// See also the implementation in uiContext.updateOffscreen.
s := u.deviceScaleFactor(u.currentMonitor())
ww := int(float64(w) / s)
wh := int(float64(h) / s)
u.setWindowSizeInDIP(ww, wh, u.isFullscreen())
})
}
u.window.SetFramebufferSizeCallback(u.defaultFramebufferSizeCallback)
}
// waitForFramebufferSizeCallback waits for GLFW's FramebufferSize callback. // waitForFramebufferSizeCallback waits for GLFW's FramebufferSize callback.
// f is a process executed after registering the callback. // f is a process executed after registering the callback.
// If the callback is not invoked for a while, waitForFramebufferSizeCallback times out and return. // If the callback is not invoked for a while, waitForFramebufferSizeCallback times out and return.
@ -905,23 +928,6 @@ func (u *UserInterface) init() error {
u.window.Maximize() u.window.Maximize()
} }
// When the window gets resized (either by manual window resize or a window
// manager), glfw sends a framebuffer size callback which we need to handle (#1960).
// This event is the only way to handle the size change at least on i3 window manager.
u.defaultFramebufferSizeCallback = glfw.ToFramebufferSizeCallback(func(_ *glfw.Window, w, h int) {
if u.isFullscreen() {
return
}
// The framebuffer size is always scaled by the device scale factor (#1975).
// See also the implementation in uiContext.updateOffscreen.
s := u.deviceScaleFactor(u.currentMonitor())
ww := int(float64(w) / s)
wh := int(float64(h) / s)
u.setWindowSizeInDIP(ww, wh, u.isFullscreen())
})
u.window.SetFramebufferSizeCallback(u.defaultFramebufferSizeCallback)
u.window.SetTitle(u.title) u.window.SetTitle(u.title)
u.window.Show() u.window.Show()