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

ui: Bug fix: Force to adjust window size when scale is changed

Browse Source 
Fixes #644
This commit is contained in:
Hajime Hoshi 2018-10-03 03:26:08 +09:00
parent eef9c01735
commit 02a2fc2d44
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/ui/ui_glfw.go
View File

@ -557,12 +557,15 @@ func (u *userInterface) updateGraphicsContext(g GraphicsContext) {
// TODO: Is it possible to reduce 'runOnMainThread' calls? // TODO: Is it possible to reduce 'runOnMainThread' calls?
_ = u.runOnMainThread(func() error { _ = u.runOnMainThread(func() error {
actualScale = u.actualScreenScale() actualScale = u.actualScreenScale()
if u.lastActualScale != actualScale {
u.forceSetScreenSize(u.width, u.height, u.scale, u.fullscreen(), u.vsync)
}
u.lastActualScale = actualScale
if !u.toChangeSize && u.lastActualScale == actualScale { if !u.toChangeSize {
return nil return nil
} }
u.lastActualScale = actualScale
u.toChangeSize = false u.toChangeSize = false
sizeChanged = true sizeChanged = true
return nil return nil
@ -672,7 +675,12 @@ func (u *userInterface) setScreenSize(width, height int, scale float64, fullscre
if u.width == width && u.height == height && u.scale == scale && u.fullscreen() == fullscreen && u.vsync == vsync { if u.width == width && u.height == height && u.scale == scale && u.fullscreen() == fullscreen && u.vsync == vsync {
return false return false
} }
u.forceSetScreenSize(width, height, scale, fullscreen, vsync)
return true
}
// forceSetScreenSize must be called from the main thread.
func (u *userInterface) forceSetScreenSize(width, height int, scale float64, fullscreen bool, vsync bool) {
// On Windows, giving a too small width doesn't call a callback (#165). // On Windows, giving a too small width doesn't call a callback (#165).
// To prevent hanging up, return asap if the width is too small. // To prevent hanging up, return asap if the width is too small.
// 252 is an arbitrary number and I guess this is small enough. // 252 is an arbitrary number and I guess this is small enough.
@ -746,5 +754,4 @@ func (u *userInterface) setScreenSize(width, height int, scale float64, fullscre
} }
u.toChangeSize = true u.toChangeSize = true
return true
} }