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

uidriver/glfw: Reduce (*thread).Call at (*UserInterface).updateSize

Browse Source 
Updates #1367
This commit is contained in:
Hajime Hoshi 2020-10-17 05:53:15 +09:00
parent d9906835ad
commit ee50f611ee
1 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -761,46 +761,34 @@ func (u *UserInterface) init() error {
return nil
}
func (u *UserInterface) updateSize() {
_ = u.t.Call(func() error {
w, h := u.windowWidth, u.windowHeight
u.setWindowSize(w, h, u.isFullscreen())
return nil
})
func (u *UserInterface) updateSize() (float64, float64, bool) {
ww, wh := u.windowWidth, u.windowHeight
u.setWindowSize(ww, wh, u.isFullscreen())
sizeChanged := false
_ = u.t.Call(func() error {
if !u.toChangeSize {
return nil
}
u.toChangeSize = false
sizeChanged = true
return nil
})
if sizeChanged {
var w, h float64
_ = u.t.Call(func() error {
if u.isFullscreen() {
v := currentMonitor(u.window).GetVideoMode()
ww, wh := v.Width, v.Height
w = u.fromGLFWMonitorPixel(float64(ww))
h = u.fromGLFWMonitorPixel(float64(wh))
} else {
// Instead of u.windowWidth and u.windowHeight, use the actual window size here.
// On Windows, the specified size at SetSize and the actual window size might not
// match (#1163).
ww, wh := u.window.GetSize()
w = u.fromGLFWPixel(float64(ww))
h = u.fromGLFWPixel(float64(wh))
}
// On Linux/UNIX, further adjusting is required (#1307).
w = u.toFramebufferPixel(w)
h = u.toFramebufferPixel(h)
return nil
})
u.context.Layout(w, h)
if !u.toChangeSize {
return 0, 0, false
}
u.toChangeSize = false
var w, h float64
if u.isFullscreen() {
v := currentMonitor(u.window).GetVideoMode()
ww, wh := v.Width, v.Height
w = u.fromGLFWMonitorPixel(float64(ww))
h = u.fromGLFWMonitorPixel(float64(wh))
} else {
// Instead of u.windowWidth and u.windowHeight, use the actual window size here.
// On Windows, the specified size at SetSize and the actual window size might not
// match (#1163).
ww, wh := u.window.GetSize()
w = u.fromGLFWPixel(float64(ww))
h = u.fromGLFWPixel(float64(wh))
}
// On Linux/UNIX, further adjusting is required (#1307).
w = u.toFramebufferPixel(w)
h = u.toFramebufferPixel(h)
return w, h, true
}
func (u *UserInterface) update() error {
@ -836,8 +824,18 @@ func (u *UserInterface) update() error {
return err
}
var w, h float64
var changed bool
// This call is needed for initialization.
u.updateSize()
_ = u.t.Call(func() error {
w, h, changed = u.updateSize()
return nil
})
if changed {
u.context.Layout(w, h)
}
_ = u.t.Call(func() error {
glfw.PollEvents()
@ -1103,7 +1101,15 @@ func (u *UserInterface) IsScreenTransparent() bool {
func (u *UserInterface) ResetForFrame() {
// The offscreens must be updated every frame (#490).
u.updateSize()
var w, h float64
var changed bool
_ = u.t.Call(func() error {
w, h, changed = u.updateSize()
return nil
})
if changed {
u.context.Layout(w, h)
}
u.input.resetForFrame()
}