some tweaks, still WIP

This commit is contained in:
Drew Weymouth
2024-03-01 16:59:04 -08:00
parent e719782437
commit c473c3ad23
3 changed files with 11 additions and 9 deletions
+8 -2
View File
@@ -10,6 +10,7 @@ import (
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/layout"
"fyne.io/fyne/v2/widget"
)
@@ -28,12 +29,14 @@ type fullscreenPageState struct {
contr *controller.Controller
pool *util.WidgetPool
pm *backend.PlaybackManager
im *backend.ImageManager
canRate bool
}
func NewFullscreenPage(
contr *controller.Controller,
pool *util.WidgetPool,
im *backend.ImageManager,
pm *backend.PlaybackManager,
canRate bool,
) *FullscreenPage {
@@ -49,7 +52,10 @@ func NewFullscreenPage(
}
func (a *FullscreenPage) CreateRenderer() fyne.WidgetRenderer {
container := container.NewPadded()
container := container.NewGridWithColumns(2,
a.card,
layout.NewSpacer(),
)
return widget.NewSimpleRenderer(container)
}
@@ -74,5 +80,5 @@ func (a *FullscreenPage) Reload() {
}
func (s *fullscreenPageState) Restore() Page {
return NewFullscreenPage(s.contr, s.pool, s.pm, s.canRate)
return NewFullscreenPage(s.contr, s.pool, s.im, s.pm, s.canRate)
}
+1 -1
View File
@@ -43,7 +43,7 @@ func (r Router) CreatePage(rte controller.Route) Page {
case controller.Favorites:
return NewFavoritesPage(&r.App.Config.FavoritesPage, r.widgetPool, r.Controller, r.App.ServerManager.Server, r.App.PlaybackManager, r.App.ImageManager)
case controller.Fullscreen:
return NewFullscreenPage(r.Controller, r.widgetPool, r.App.PlaybackManager, canRate)
return NewFullscreenPage(r.Controller, r.widgetPool, r.App.ImageManager, r.App.PlaybackManager, canRate)
case controller.Genre:
return NewGenrePage(rte.Arg, r.widgetPool, r.Controller, r.App.PlaybackManager, r.App.ServerManager.Server, r.App.ImageManager)
case controller.Genres:
+2 -6
View File
@@ -50,11 +50,6 @@ func NewLargeNowPlayingCard() *LargeNowPlayingCard {
return n
}
func (n *LargeNowPlayingCard) MinSize() fyne.Size {
// prop up height for when cover image is hidden
return fyne.NewSize(n.BaseWidget.MinSize().Width, 85)
}
func (n *LargeNowPlayingCard) onAlbumNameTapped() {
if n.OnAlbumNameTapped != nil {
n.OnAlbumNameTapped()
@@ -97,7 +92,8 @@ func (n *LargeNowPlayingCard) CreateRenderer() fyne.WidgetRenderer {
n.albumName,
n.artistName,
)
c := container.NewBorder(nil, vbox, nil, nil, n.cover)
c := container.NewCenter(
container.NewBorder(nil, vbox, nil, nil, n.cover))
return widget.NewSimpleRenderer(c)
}