owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

create new page for GoHome instead of using browsing history

Browse Source
This commit is contained in:
Drew Weymouth
2024-04-29 08:55:02 -07:00
parent e4514c502c
commit c161f2b171
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/browsing/browsingpane.go
+2 -13
View File
@@ -75,10 +75,10 @@ type BrowsingPane struct {
navBtnsPageMap map[controller.PageName]fyne.Resource navBtnsPageMap map[controller.PageName]fyne.Resource
} }
func NewBrowsingPane(app *backend.App, contr *controller.Controller) *BrowsingPane { func NewBrowsingPane(app *backend.App, contr *controller.Controller, onGoHome func()) *BrowsingPane {
b := &BrowsingPane{app: app} b := &BrowsingPane{app: app}
b.ExtendBaseWidget(b) b.ExtendBaseWidget(b)
b.home = widget.NewButtonWithIcon("", theme.HomeIcon(), b.GoHome) b.home = widget.NewButtonWithIcon("", theme.HomeIcon(), onGoHome)
b.back = widget.NewButtonWithIcon("", theme.NavigateBackIcon(), b.GoBack) b.back = widget.NewButtonWithIcon("", theme.NavigateBackIcon(), b.GoBack)
b.forward = widget.NewButtonWithIcon("", theme.NavigateNextIcon(), b.GoForward) b.forward = widget.NewButtonWithIcon("", theme.NavigateNextIcon(), b.GoForward)
b.reload = widget.NewButtonWithIcon("", theme.ViewRefreshIcon(), b.Reload) b.reload = widget.NewButtonWithIcon("", theme.ViewRefreshIcon(), b.Reload)
@@ -269,17 +269,6 @@ func (b *BrowsingPane) updateHistoryButtons() {
} }
} }
func (b *BrowsingPane) GoHome() {
if len(b.history) > 0 {
homePage := b.history[0].Restore()
if b.CurrentPage() != homePage.Route() {
b.addPageToHistory(b.curPage, false)
b.doSetPage(homePage)
b.updateHistoryButtons()
}
}
}
func (b *BrowsingPane) GoBack() { func (b *BrowsingPane) GoBack() {
if b.historyIdx > 0 { if b.historyIdx > 0 {
// due to widget reuse between pages, // due to widget reuse between pages,
ui/mainwindow.go
+1 -1
View File
@@ -75,7 +75,7 @@ func NewMainWindow(fyneApp fyne.App, appName, displayAppName, appVersion string,
MainWindow: m.Window, MainWindow: m.Window,
App: app, App: app,
} }
m.BrowsingPane = browsing.NewBrowsingPane(app, m.Controller) m.BrowsingPane = browsing.NewBrowsingPane(app, m.Controller, func() { m.Router.NavigateTo(m.StartupPage()) })
m.Router = browsing.NewRouter(app, m.Controller, m.BrowsingPane) m.Router = browsing.NewRouter(app, m.Controller, m.BrowsingPane)
// inject controller dependencies // inject controller dependencies
m.Controller.NavHandler = m.Router.NavigateTo m.Controller.NavHandler = m.Router.NavigateTo