disable window workaround on Wayland as well

This commit is contained in:
Drew Weymouth
2024-08-15 08:32:05 -07:00
parent b44fab22b2
commit 72e670f13f
+14 -5
View File
@@ -15,6 +15,7 @@ import (
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/app" "fyne.io/fyne/v2/app"
"fyne.io/fyne/v2/driver"
"fyne.io/fyne/v2/lang" "fyne.io/fyne/v2/lang"
) )
@@ -65,11 +66,19 @@ func main() {
// slightly hacky workaround for https://github.com/fyne-io/fyne/issues/4964 // slightly hacky workaround for https://github.com/fyne-io/fyne/issues/4964
if runtime.GOOS == "linux" { if runtime.GOOS == "linux" {
workaroundWindowSize := sync.OnceFunc(func() { workaroundWindowSize := sync.OnceFunc(func() {
time.Sleep(50 * time.Millisecond) go func() {
s := mainWindow.DesiredSize() isWayland := false
mainWindow.Window.Resize(s.Subtract(fyne.NewSize(4, 0))) mainWindow.Window.(driver.NativeWindow).RunNative(func(ctx any) {
time.Sleep(50 * time.Millisecond) _, isWayland = ctx.(*driver.WaylandWindowContext)
mainWindow.Window.Resize(s) // back to desired size })
if !isWayland {
time.Sleep(50 * time.Millisecond)
s := mainWindow.DesiredSize()
mainWindow.Window.Resize(s.Subtract(fyne.NewSize(4, 0)))
time.Sleep(50 * time.Millisecond)
mainWindow.Window.Resize(s) // back to desired size
}
}()
}) })
fyneApp.Lifecycle().SetOnEnteredForeground(func() { fyneApp.Lifecycle().SetOnEnteredForeground(func() {
workaroundWindowSize() workaroundWindowSize()