adjust sleeps, add debug logs

This commit is contained in:
Drew Weymouth
2024-08-08 08:22:23 -07:00
parent 1ff9d2d026
commit 697aa911f5
2 changed files with 11 additions and 5 deletions
+8 -2
View File
@@ -63,14 +63,20 @@ 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
workaroundWindowSize := sync.OnceFunc(func() { workaroundWindowSize := sync.OnceFunc(func() {
time.Sleep(10 * time.Millisecond) time.Sleep(50 * time.Millisecond)
s := mainWindow.DesiredSize() 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 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() { fyneApp.Lifecycle().SetOnEnteredForeground(func() {
workaroundWindowSize() workaroundWindowSize()
}) })
mainWindow.ShowAndRun() mainWindow.ShowAndRun()
log.Println("Running shutdown tasks...") log.Println("Running shutdown tasks...")
+3 -3
View File
@@ -81,9 +81,6 @@ func NewMainWindow(fyneApp fyne.App, appName, displayAppName, appVersion string,
} }
m.BottomPanel = NewBottomPanel(app.PlaybackManager, app.ImageManager, m.Controller) 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) { app.PlaybackManager.OnSongChange(func(item mediaprovider.MediaItem, _ *mediaprovider.Track) {
if item == nil { if item == nil {
m.Window.SetTitle(displayAppName) m.Window.SetTitle(displayAppName)
@@ -138,6 +135,9 @@ func NewMainWindow(fyneApp fyne.App, appName, displayAppName, appVersion string,
m.BrowsingPane.DisableNavigationButtons() m.BrowsingPane.DisableNavigationButtons()
m.addShortcuts() 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.Window.SetCloseIntercept(func() {
m.SaveWindowSize() m.SaveWindowSize()
if app.Config.Application.CloseToSystemTray && m.HaveSystemTray() { if app.Config.Application.CloseToSystemTray && m.HaveSystemTray() {