match X11 and close down our app if the simulator window is closed

fyne-io · Jan 13, 2025 · d6d65dc · d6d65dc
1 parent ae4dacb
commit d6d65dc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/internal/driver/mobile/app/darwin_desktop.go b/internal/driver/mobile/app/darwin_desktop.go
@@ -160,8 +160,18 @@ func eventMouseDragged(x, y float32) { sendTouch(touch.TypeMove, x, y) }
 //export eventMouseEnd
 func eventMouseEnd(x, y float32) { sendTouch(touch.TypeEnd, x, y) }
 
+var stopped = false
+
 //export lifecycleDead
-func lifecycleDead() { theApp.sendLifecycle(lifecycle.StageDead) }
+func lifecycleDead() {
+	if stopped {
+		return
+	}
+	stopped = true
+
+	theApp.sendLifecycle(lifecycle.StageDead)
+	theApp.events.Close()
+}
 
 //export eventKey
 func eventKey(runeVal int32, direction uint8, code uint16, flags uint32) {

diff --git a/internal/driver/mobile/app/darwin_desktop.m b/internal/driver/mobile/app/darwin_desktop.m
@@ -136,7 +136,7 @@ - (void)applicationWillUnhide:(NSNotification *)notification {
 }
 
 - (void)windowWillClose:(NSNotification *)notification {
-	lifecycleAlive();
+	lifecycleDead();
 }
 
 - (BOOL)acceptsFirstResponder {