mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-11 19:48:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

ui: Bug fix: Wrong assumption that the position was always >= 0

Browse Source
This commit is contained in:
Hajime Hoshi 2019-02-24 23:31:26 +09:00
parent ba59cdbc5f
commit ea7c2f8da3
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/ui/ui_glfw.go
View File

@ -68,10 +68,16 @@ type userInterface struct {
m sync.Mutex m sync.Mutex
} }
const (
maxInt = int(^uint(0) >> 1)
minInt = -maxInt - 1
invalidPos = minInt
)
var ( var (
currentUI = &userInterface{ currentUI = &userInterface{
origPosX: -1, origPosX: invalidPos,
origPosY: -1, origPosY: invalidPos,
initCursorVisible: true, initCursorVisible: true,
initWindowDecorated: true, initWindowDecorated: true,
vsync: true, vsync: true,
@ -869,7 +875,7 @@ func (u *userInterface) forceSetScreenSize(width, height int, scale float64, ful
u.swapBuffers() u.swapBuffers()
if fullscreen { if fullscreen {
if u.origPosX < 0 && u.origPosY < 0 { if u.origPosX == invalidPos || u.origPosY == invalidPos {
u.origPosX, u.origPosY = u.window.GetPos() u.origPosX, u.origPosY = u.window.GetPos()
} }
m := u.currentMonitor() m := u.currentMonitor()
@ -902,7 +908,7 @@ func (u *userInterface) forceSetScreenSize(width, height int, scale float64, ful
} }
} }
if u.origPosX >= 0 && u.origPosY >= 0 { if u.origPosX != invalidPos && u.origPosY != invalidPos {
x := u.origPosX x := u.origPosX
y := u.origPosY y := u.origPosY
u.window.SetPos(x, y) u.window.SetPos(x, y)
@ -912,8 +918,8 @@ func (u *userInterface) forceSetScreenSize(width, height int, scale float64, ful
u.window.SetPos(x+1, y) u.window.SetPos(x+1, y)
u.window.SetPos(x, y) u.window.SetPos(x, y)
} }
u.origPosX = -1 u.origPosX = invalidPos
u.origPosY = -1 u.origPosY = invalidPos
} }
// Window title might be lost on macOS after coming back from fullscreen. // Window title might be lost on macOS after coming back from fullscreen.