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

ui: Make (Set)WindowPosition concurrent safe

Browse Source
This commit is contained in:
Hajime Hoshi 2019-12-01 00:11:46 +09:00
parent d78b4d7ffd
commit e463f9e611
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,6 +271,29 @@ func (u *UserInterface) setInitIconImages(iconImages []image.Image) {
u.m.Unlock() u.m.Unlock()
} }
func (u *UserInterface) getInitWindowPosition() (int, int, bool) {
u.m.RLock()
defer u.m.RUnlock()
if u.initWindowPositionX != nil && u.initWindowPositionY != nil {
return *u.initWindowPositionX, *u.initWindowPositionY, true
}
return 0, 0, false
}
func (u *UserInterface) setInitWindowPosition(x, y int) {
u.m.Lock()
defer u.m.Unlock()
if u.initWindowPositionX == nil {
u.initWindowPositionX = new(int)
}
if u.initWindowPositionY == nil {
u.initWindowPositionY = new(int)
}
*u.initWindowPositionX = x
*u.initWindowPositionY = y
}
func (u *UserInterface) ScreenSizeInFullscreen() (int, int) { func (u *UserInterface) ScreenSizeInFullscreen() (int, int) {
if !u.isRunning() { if !u.isRunning() {
return u.initFullscreenWidth, u.initFullscreenHeight return u.initFullscreenWidth, u.initFullscreenHeight
@ -668,11 +691,8 @@ func (u *UserInterface) run(width, height int, scale float64, title string, cont
u.window.SetTitle(title) u.window.SetTitle(title)
u.window.Show() u.window.Show()
x, y := 0, 0 x, y, ok := u.getInitWindowPosition()
if u.initWindowPositionX != nil && u.initWindowPositionY != nil { if !ok {
x = *u.initWindowPositionX
y = *u.initWindowPositionY
} else {
x = mx + (v.Width-w)/2 x = mx + (v.Width-w)/2
y = my + (v.Height-h)/3 y = my + (v.Height-h)/3
} }
@ -1006,14 +1026,7 @@ func (u *UserInterface) currentMonitor() *glfw.Monitor {
func (u *UserInterface) SetWindowPosition(x, y int) { func (u *UserInterface) SetWindowPosition(x, y int) {
if !u.isRunning() { if !u.isRunning() {
if u.initWindowPositionX == nil { u.setInitWindowPosition(x, y)
u.initWindowPositionX = new(int)
}
if u.initWindowPositionY == nil {
u.initWindowPositionY = new(int)
}
*u.initWindowPositionX = x
*u.initWindowPositionY = y
return return
} }
_ = u.t.Call(func() error { _ = u.t.Call(func() error {

4
window.go
View File

@ -100,6 +100,8 @@ func SetWindowIcon(iconImages []image.Image) {
// WindowPosition panics before Run is called. // WindowPosition panics before Run is called.
// //
// WindowPosition returns (0, 0) on browsers and mobiles. // WindowPosition returns (0, 0) on browsers and mobiles.
//
// WindowPosition is concurrent-safe.
func WindowPosition() (x, y int) { func WindowPosition() (x, y int) {
return uiDriver().WindowPosition() return uiDriver().WindowPosition()
} }
@ -109,6 +111,8 @@ func WindowPosition() (x, y int) {
// SetWindowPosition works before and after Run is called. // SetWindowPosition works before and after Run is called.
// //
// SetWindowPosition does nothing on browsers and mobiles. // SetWindowPosition does nothing on browsers and mobiles.
//
// SetWindowPosition is concurrent-safe.
func SetWindowPosition(x, y int) { func SetWindowPosition(x, y int) {
uiDriver().SetWindowPosition(x, y) uiDriver().SetWindowPosition(x, y)
} }