From 55a959ac4c5134a35aea0a69467a0233f6c1f46a Mon Sep 17 00:00:00 2001 From: natilou Date: Fri, 29 Dec 2023 09:53:24 -0300 Subject: [PATCH] adding default color name, calling updateNavBtnsColor in SetPage and handling the nil case --- ui/browsing/browsingpane.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/browsing/browsingpane.go b/ui/browsing/browsingpane.go index 6aab949..01c7d27 100644 --- a/ui/browsing/browsingpane.go +++ b/ui/browsing/browsingpane.go @@ -102,6 +102,7 @@ func (b *BrowsingPane) SetPage(p Page) { b.pageContainer.Objects[1] = layout.NewSpacer() b.curPage = nil b.pageContainer.Refresh() + b.updateNavBtnsColor(p) } else { oldPage := b.curPage if b.doSetPage(p) && oldPage != nil { @@ -282,10 +283,10 @@ func (b *BrowsingPane) CreateRenderer() fyne.WidgetRenderer { func (b *BrowsingPane) updateNavBtnsColor(p Page) { for pageName, icon := range b.navBtnsPageMap { - if pageName == p.Route().Page { + if p != nil && pageName == p.Route().Page { icon.(*theme.ThemedResource).ColorName = theme.ColorNamePrimary } else { - icon.(*theme.ThemedResource).ColorName = "" + icon.(*theme.ThemedResource).ColorName = theme.ColorNameForeground } } }