joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-01 07:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

app: [Android] Send focus lost event when the window is backgrounded

Browse Source 
Fixes: https://todo.sr.ht/~eliasnaur/gio/679
Signed-off-by: CoyAce <AkeyCoy@gmail.com>
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
CoyAce
2025-12-28 23:17:55 +08:00
committed by Elias Naur
parent c250d7d562
commit 93419a77bd
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/os_android.go
+13 -4
View File
@@ -162,6 +162,7 @@ type window struct {
insets pixelInsets insets pixelInsets
visible bool visible bool
focused bool
started bool started bool
animating bool animating bool
@@ -529,6 +530,7 @@ func Java_org_gioui_GioView_onStopView(env *C.JNIEnv, class C.jclass, handle C.j
w := cgo.Handle(handle).Value().(*window) w := cgo.Handle(handle).Value().(*window)
w.started = false w.started = false
w.visible = false w.visible = false
w.sendConfigEvent()
} }
//export Java_org_gioui_GioView_onStartView //export Java_org_gioui_GioView_onStartView
@@ -545,6 +547,7 @@ func Java_org_gioui_GioView_onSurfaceDestroyed(env *C.JNIEnv, class C.jclass, ha
w := cgo.Handle(handle).Value().(*window) w := cgo.Handle(handle).Value().(*window)
w.win = nil w.win = nil
w.visible = false w.visible = false
w.sendConfigEvent()
} }
//export Java_org_gioui_GioView_onSurfaceChanged //export Java_org_gioui_GioView_onSurfaceChanged
@@ -590,8 +593,8 @@ func Java_org_gioui_GioView_onBack(env *C.JNIEnv, class C.jclass, view C.jlong)
//export Java_org_gioui_GioView_onFocusChange //export Java_org_gioui_GioView_onFocusChange
func Java_org_gioui_GioView_onFocusChange(env *C.JNIEnv, class C.jclass, view C.jlong, focus C.jboolean) { func Java_org_gioui_GioView_onFocusChange(env *C.JNIEnv, class C.jclass, view C.jlong, focus C.jboolean) {
w := cgo.Handle(view).Value().(*window) w := cgo.Handle(view).Value().(*window)
w.config.Focused = focus == C.JNI_TRUE w.focused = focus == C.JNI_TRUE
w.processEvent(ConfigEvent{Config: w.config}) w.sendConfigEvent()
} }
//export Java_org_gioui_GioView_onWindowInsets //export Java_org_gioui_GioView_onWindowInsets
@@ -817,9 +820,15 @@ func (w *window) setVisible(env *C.JNIEnv) {
return return
} }
w.visible = true w.visible = true
w.sendConfigEvent()
w.draw(env, true) w.draw(env, true)
} }
func (w *window) sendConfigEvent() {
w.config.Focused = w.visible && w.focused
w.processEvent(ConfigEvent{Config: w.config})
}
func (w *window) setVisual(visID int) error { func (w *window) setVisual(visID int) error {
if C.ANativeWindow_setBuffersGeometry(w.win, 0, 0, C.int32_t(visID)) != 0 { if C.ANativeWindow_setBuffersGeometry(w.win, 0, 0, C.int32_t(visID)) != 0 {
return errors.New("ANativeWindow_setBuffersGeometry failed") return errors.New("ANativeWindow_setBuffersGeometry failed")
@@ -862,7 +871,7 @@ func (w *window) draw(env *C.JNIEnv, sync bool) {
size := image.Pt(int(C.ANativeWindow_getWidth(w.win)), int(C.ANativeWindow_getHeight(w.win))) size := image.Pt(int(C.ANativeWindow_getWidth(w.win)), int(C.ANativeWindow_getHeight(w.win)))
if size != w.config.Size { if size != w.config.Size {
w.config.Size = size w.config.Size = size
w.processEvent(ConfigEvent{Config: w.config}) w.sendConfigEvent()
} }
if size.X == 0 || size.Y == 0 { if size.X == 0 || size.Y == 0 {
return return
@@ -1398,7 +1407,7 @@ func (w *window) setConfig(env *C.JNIEnv, cnf Config) {
if cnf.Decorated != prev.Decorated { if cnf.Decorated != prev.Decorated {
w.config.Decorated = cnf.Decorated w.config.Decorated = cnf.Decorated
} }
w.processEvent(ConfigEvent{Config: w.config}) w.sendConfigEvent()
} }
func (w *window) Perform(system.Action) {} func (w *window) Perform(system.Action) {}