From de2bd503a73954272647821dd57cf342d8a358ca Mon Sep 17 00:00:00 2001 From: FPabl0 Date: Sat, 20 Feb 2021 00:55:50 -0500 Subject: [PATCH] mobileDriver.currentWindow should not return hidden windows --- internal/driver/gomobile/driver.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/internal/driver/gomobile/driver.go b/internal/driver/gomobile/driver.go index e79714b0e2..4a428f54e7 100644 --- a/internal/driver/gomobile/driver.go +++ b/internal/driver/gomobile/driver.go @@ -63,7 +63,15 @@ func (d *mobileDriver) currentWindow() fyne.Window { return nil } - return d.windows[len(d.windows)-1] + var last fyne.Window + for i := len(d.windows) - 1; i >= 0; i-- { + last = d.windows[i] + if last.(*window).visible { + return last + } + } + + return last } func (d *mobileDriver) RenderedTextSize(text string, size float32, style fyne.TextStyle) fyne.Size {