From 697aa911f505b634c5123623a8c92c0f5159eb82 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Thu, 8 Aug 2024 08:22:23 -0700 Subject: [PATCH] adjust sleeps, add debug logs --- main.go | 10 ++++++++-- ui/mainwindow.go | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/main.go b/main.go index 482f84b..dc18e17 100644 --- a/main.go +++ b/main.go @@ -63,14 +63,20 @@ func main() { // slightly hacky workaround for https://github.com/fyne-io/fyne/issues/4964 workaroundWindowSize := sync.OnceFunc(func() { - time.Sleep(10 * time.Millisecond) + time.Sleep(50 * time.Millisecond) s := mainWindow.DesiredSize() - mainWindow.Window.Resize(s.Subtract(fyne.NewSize(2, 0))) + log.Printf("canvas size is %+v, desired size is %+v\n", mainWindow.Window.Canvas().Size(), s) + mainWindow.Window.Resize(s.Subtract(fyne.NewSize(4, 0))) + log.Printf("canvas size is %+v, desired size is %+v\n", mainWindow.Window.Canvas().Size(), s) + time.Sleep(30 * time.Millisecond) mainWindow.Window.Resize(s) // back to desired size + time.Sleep(30 * time.Millisecond) + log.Printf("canvas size is %+v, desired size is %+v\n", mainWindow.Window.Canvas().Size(), s) }) fyneApp.Lifecycle().SetOnEnteredForeground(func() { workaroundWindowSize() }) + mainWindow.ShowAndRun() log.Println("Running shutdown tasks...") diff --git a/ui/mainwindow.go b/ui/mainwindow.go index 05683b5..f954dad 100644 --- a/ui/mainwindow.go +++ b/ui/mainwindow.go @@ -81,9 +81,6 @@ func NewMainWindow(fyneApp fyne.App, appName, displayAppName, appVersion string, } m.BottomPanel = NewBottomPanel(app.PlaybackManager, app.ImageManager, m.Controller) - m.container = container.NewBorder(nil, m.BottomPanel, nil, nil, m.BrowsingPane) - m.Window.SetContent(fynetooltip.AddWindowToolTipLayer(m.container, m.Window.Canvas())) - m.setInitialSize() app.PlaybackManager.OnSongChange(func(item mediaprovider.MediaItem, _ *mediaprovider.Track) { if item == nil { m.Window.SetTitle(displayAppName) @@ -138,6 +135,9 @@ func NewMainWindow(fyneApp fyne.App, appName, displayAppName, appVersion string, m.BrowsingPane.DisableNavigationButtons() m.addShortcuts() + m.container = container.NewBorder(nil, m.BottomPanel, nil, nil, m.BrowsingPane) + m.Window.SetContent(fynetooltip.AddWindowToolTipLayer(m.container, m.Window.Canvas())) + m.setInitialSize() m.Window.SetCloseIntercept(func() { m.SaveWindowSize() if app.Config.Application.CloseToSystemTray && m.HaveSystemTray() {