Merge pull request #1645 from cogentcore/content

Content fixes: ctrl+click for new tab, and fix the history

Author: kkoreilly

content/buttons.go

@@ -38,42 +38,49 @@ func (ct *Content) MakeToolbar(p *tree.Plan) {
 		w.SetIcon(icons.Icon(core.AppIcon))
 		w.SetTooltip("Home")
 		w.OnClick(func(e events.Event) {
-			ct.Open("")
+			ct.OpenEvent("", e)
 		})
 	})
 	// Superseded by browser navigation on web.
 	if core.TheApp.Platform() != system.Web {
 		tree.Add(p, func(w *core.Button) {
+			ct.toolbar = w.Parent.(*core.Toolbar)
 			w.SetIcon(icons.ArrowBack).SetKey(keymap.HistPrev)
 			w.SetTooltip("Back")
 			w.Updater(func() {
-				w.SetEnabled(ct.historyIndex > 0)
+				w.SetEnabled(ct.historyHasBack())
 			})
 			w.OnClick(func(e events.Event) {
-				ct.historyIndex--
-				ct.open(ct.history[ct.historyIndex].URL, false) // do not add to history while navigating history
+				ct.historyBack()
+				if ct.toolbar != nil {
+					ct.toolbar.Update()
+				}
 			})
 		})
 		tree.Add(p, func(w *core.Button) {
 			w.SetIcon(icons.ArrowForward).SetKey(keymap.HistNext)
 			w.SetTooltip("Forward")
 			w.Updater(func() {
-				w.SetEnabled(ct.historyIndex < len(ct.history)-1)
+				w.SetEnabled(ct.historyHasForward())
 			})
 			w.OnClick(func(e events.Event) {
-				ct.historyIndex++
-				ct.open(ct.history[ct.historyIndex].URL, false) // do not add to history while navigating history
+				ct.historyForward()
+				if ct.toolbar != nil {
+					ct.toolbar.Update()
+				}
 			})
 		})
 	}
 	tree.Add(p, func(w *core.Button) {
-		w.SetText("Search").SetIcon(icons.Search).SetKey(keymap.Menu)
+		find := keymap.Find.Chord().Label()
+		w.SetText("Search").SetIcon(icons.Search).SetKey(keymap.Menu).
+			SetTooltip("Search for pages by name (use " + find + " or context menu to search within current page)")
 		w.Styler(func(s *styles.Style) {
 			s.Background = colors.Scheme.SurfaceVariant
 			s.Padding.Right.Em(5)
 		})
 		w.OnClick(func(e events.Event) {
-			ct.Scene.MenuSearchDialog("Search", "Search "+core.TheApp.Name())
+			ct.Scene.MenuSearchDialog("Page search", "Search "+core.TheApp.Name())
 		})
 	})
 }
@@ -88,6 +95,23 @@ func (ct *Content) MakeToolbarPDF(p *tree.Plan) {
 	})
 }
 
+// MakeToolbarSearch adds a within-page search button to the toolbar.
+// This is optional.
+func (ct *Content) MakeToolbarSearch(p *tree.Plan) {
+	tree.Add(p, func(w *core.Button) {
+		w.SetText("Search").SetIcon(icons.Search).SetKey(keymap.Find).
+			SetTooltip("Search within content of current page")
+		w.Styler(func(s *styles.Style) {
+			s.Background = colors.Scheme.SurfaceVariant
+			s.Padding.Right.Em(5)
+		})
+		w.OnClick(func(e events.Event) {
+			e.SetHandled()
+			core.Search(ct.rightFrame, core.LastSearch, core.LastUseCase)
+		})
+	})
+}
+
 func (ct *Content) MenuSearch(items *[]core.ChooserItem) {
 	newItems := make([]core.ChooserItem, len(ct.pages))
 	for i, pg := range ct.pages {
@@ -105,12 +129,12 @@ func (ct *Content) MenuSearch(items *[]core.ChooserItem) {
 
 // makeBottomButtons makes the previous and next buttons if relevant.
 func (ct *Content) makeBottomButtons(p *tree.Plan) {
-	if len(ct.currentPage.Categories) == 0 {
+	if len(ct.current.Page.Categories) == 0 {
 		return
 	}
-	cat := ct.currentPage.Categories[0]
+	cat := ct.current.Page.Categories[0]
 	pages := ct.pagesByCategory[cat]
-	idx := slices.Index(pages, ct.currentPage)
+	idx := slices.Index(pages, ct.current.Page)
 
 	ct.prevPage, ct.nextPage = nil, nil