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

internal/glfw: bug fix: the window should be focused when closing is handled

Browse Source 
Closes #2165
This commit is contained in:
Hajime Hoshi 2022-08-12 22:34:17 +09:00
parent dd292552d5
commit bc8e2fe6ac
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/glfw/glfw_notwindows.go
View File

@ -105,6 +105,10 @@ func (w *Window) Destroy() {
theWindows.remove(w.w) theWindows.remove(w.w)
} }
func (w *Window) Focus() {
w.w.Focus()
}
func (w *Window) GetAttrib(attrib Hint) int { func (w *Window) GetAttrib(attrib Hint) int {
return w.w.GetAttrib(glfw.Hint(attrib)) return w.w.GetAttrib(glfw.Hint(attrib))
} }

18
internal/glfw/glfw_windows.go
View File

@ -66,6 +66,12 @@ func (w *Window) Destroy() {
} }
} }
func (w *Window) Focus() {
if err := (*glfwwin.Window)(w).Focus(); err != nil {
panic(err)
}
}
func (w *Window) GetAttrib(attrib Hint) int { func (w *Window) GetAttrib(attrib Hint) int {
r, err := (*glfwwin.Window)(w).GetAttrib(glfwwin.Hint(attrib)) r, err := (*glfwwin.Window)(w).GetAttrib(glfwwin.Hint(attrib))
if err != nil { if err != nil {
@ -74,12 +80,6 @@ func (w *Window) GetAttrib(attrib Hint) int {
return r return r
} }
func (w *Window) SetAttrib(attrib Hint, value int) {
if err := (*glfwwin.Window)(w).SetAttrib(glfwwin.Hint(attrib), value); err != nil {
panic(err)
}
}
func (w *Window) GetCursorPos() (x, y float64) { func (w *Window) GetCursorPos() (x, y float64) {
x, y, err := (*glfwwin.Window)(w).GetCursorPos() x, y, err := (*glfwwin.Window)(w).GetCursorPos()
if err != nil { if err != nil {
@ -166,6 +166,12 @@ func (w *Window) Restore() {
} }
} }
func (w *Window) SetAttrib(attrib Hint, value int) {
if err := (*glfwwin.Window)(w).SetAttrib(glfwwin.Hint(attrib), value); err != nil {
panic(err)
}
}
func (w *Window) SetCharModsCallback(cbfun CharModsCallback) (previous CharModsCallback) { func (w *Window) SetCharModsCallback(cbfun CharModsCallback) (previous CharModsCallback) {
f, err := (*glfwwin.Window)(w).SetCharModsCallback(cbfun) f, err := (*glfwwin.Window)(w).SetCharModsCallback(cbfun)
if err != nil { if err != nil {

1
internal/ui/ui_glfw.go
View File

@ -780,6 +780,7 @@ func (u *userInterfaceImpl) registerWindowCloseCallback() {
if !u.isWindowClosingHandled() { if !u.isWindowClosingHandled() {
return return
} }
u.window.Focus()
u.window.SetShouldClose(false) u.window.SetShouldClose(false)
}) })
} }