mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-10 04:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

uidriver/js: Bug fix: context must not be accessed before loop

Browse Source
This commit is contained in:
Hajime Hoshi 2019-10-14 02:41:04 +09:00
parent 4907cee128
commit 30c185f254
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
internal/uidriver/js/ui.go
View File

@ -222,7 +222,7 @@ func (u *UserInterface) update() error {
} }
func (u *UserInterface) loop(context driver.UIContext) <-chan error { func (u *UserInterface) loop(context driver.UIContext) <-chan error {
u.context = context u.init(context)
ch := make(chan error) ch := make(chan error)
var cf js.Func var cf js.Func
@ -253,6 +253,37 @@ func (u *UserInterface) loop(context driver.UIContext) <-chan error {
return ch return ch
} }
func (u *UserInterface) init(context driver.UIContext) {
u.context = context
window.Call("addEventListener", "focus", js.FuncOf(func(this js.Value, args []js.Value) interface{} {
u.windowFocus = true
if u.suspended() {
u.context.SuspendAudio()
} else {
u.context.ResumeAudio()
}
return nil
}))
window.Call("addEventListener", "blur", js.FuncOf(func(this js.Value, args []js.Value) interface{} {
u.windowFocus = false
if u.suspended() {
u.context.SuspendAudio()
} else {
u.context.ResumeAudio()
}
return nil
}))
document.Call("addEventListener", "visibilitychange", js.FuncOf(func(this js.Value, args []js.Value) interface{} {
u.pageVisible = !document.Get("hidden").Bool()
if u.suspended() {
u.context.SuspendAudio()
} else {
u.context.ResumeAudio()
}
return nil
}))
}
func init() { func init() {
if document.Get("body") == js.Null() { if document.Get("body") == js.Null() {
ch := make(chan struct{}) ch := make(chan struct{})
@ -263,33 +294,6 @@ func init() {
<-ch <-ch
} }
window.Call("addEventListener", "focus", js.FuncOf(func(this js.Value, args []js.Value) interface{} {
theUI.windowFocus = true
if theUI.suspended() {
theUI.context.SuspendAudio()
} else {
theUI.context.ResumeAudio()
}
return nil
}))
window.Call("addEventListener", "blur", js.FuncOf(func(this js.Value, args []js.Value) interface{} {
theUI.windowFocus = false
if theUI.suspended() {
theUI.context.SuspendAudio()
} else {
theUI.context.ResumeAudio()
}
return nil
}))
document.Call("addEventListener", "visibilitychange", js.FuncOf(func(this js.Value, args []js.Value) interface{} {
theUI.pageVisible = !document.Get("hidden").Bool()
if theUI.suspended() {
theUI.context.SuspendAudio()
} else {
theUI.context.ResumeAudio()
}
return nil
}))
window.Call("addEventListener", "resize", js.FuncOf(func(this js.Value, args []js.Value) interface{} { window.Call("addEventListener", "resize", js.FuncOf(func(this js.Value, args []js.Value) interface{} {
theUI.updateScreenSize() theUI.updateScreenSize()
return nil return nil