From dc983c4755741d43b0165c09332110141f027d1b Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Wed, 18 May 2022 16:16:38 -0400 Subject: [PATCH] feat: add statusbar symbols --- ui/pages/repo/files.go | 4 ++-- ui/pages/repo/log.go | 4 ++-- ui/pages/repo/refs.go | 7 ++++++- ui/pages/repo/repo.go | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ui/pages/repo/files.go b/ui/pages/repo/files.go index 9ba0845668c4a289ea045771acac6d274cfe57e8..e199c0aa33e9be8414961176cf035d6669d758a3 100644 --- a/ui/pages/repo/files.go +++ b/ui/pages/repo/files.go @@ -298,9 +298,9 @@ func (f *Files) StatusBarValue() string { func (f *Files) StatusBarInfo() string { switch f.activeView { case filesViewFiles: - return fmt.Sprintf("%d/%d", f.selector.Index()+1, len(f.selector.VisibleItems())) + return fmt.Sprintf(" %d/%d", f.selector.Index()+1, len(f.selector.VisibleItems())) case filesViewContent: - return fmt.Sprintf("%.f%%", f.code.ScrollPercent()*100) + return fmt.Sprintf("☰ %.f%%", f.code.ScrollPercent()*100) default: return "" } diff --git a/ui/pages/repo/log.go b/ui/pages/repo/log.go index 23c757d76bb2dbee6780eb2c3b5ad60ca9e987ef..0928068b48a087e9e451f0954d6465499b7faeb3 100644 --- a/ui/pages/repo/log.go +++ b/ui/pages/repo/log.go @@ -294,9 +294,9 @@ func (l *Log) StatusBarInfo() string { case logViewCommits: // We're using l.nextPage instead of l.selector.Paginator.Page because // of the paginator hack above. - return fmt.Sprintf("%d/%d", l.nextPage+1, l.selector.TotalPages()) + return fmt.Sprintf("p. %d/%d", l.nextPage+1, l.selector.TotalPages()) case logViewDiff: - return fmt.Sprintf("%.f%%", l.vp.ScrollPercent()*100) + return fmt.Sprintf("☰ %.f%%", l.vp.ScrollPercent()*100) default: return "" } diff --git a/ui/pages/repo/refs.go b/ui/pages/repo/refs.go index f0581e4878e387d199fb7fa7810eddbe8bf9e9fc..6fc2a15c050c5642baa33432936d99579bf42e24 100644 --- a/ui/pages/repo/refs.go +++ b/ui/pages/repo/refs.go @@ -1,6 +1,7 @@ package repo import ( + "fmt" "sort" "strings" @@ -38,7 +39,7 @@ func NewRefs(common common.Common, refPrefix string) *Refs { s := selector.New(common, []selector.IdentifiableItem{}, RefItemDelegate{&common}) s.SetShowFilter(false) s.SetShowHelp(false) - s.SetShowPagination(true) + s.SetShowPagination(false) s.SetShowStatusBar(false) s.SetShowTitle(false) s.SetFilteringEnabled(false) @@ -156,6 +157,10 @@ func (r *Refs) StatusBarValue() string { // StatusBarInfo implements statusbar.StatusBar. func (r *Refs) StatusBarInfo() string { + totalPages := r.selector.TotalPages() + if totalPages > 1 { + return fmt.Sprintf("p. %d/%d", r.selector.Page()+1, totalPages) + } return "" } diff --git a/ui/pages/repo/repo.go b/ui/pages/repo/repo.go index c7ccc83b8762c579be61d9215bf5c55de952b3c7..6b69527b16adb20826d6ca7124b25bda42ebe56c 100644 --- a/ui/pages/repo/repo.go +++ b/ui/pages/repo/repo.go @@ -301,7 +301,7 @@ func (r *Repo) updateStatusBarCmd() tea.Msg { var info, value string switch r.activeTab { case readmeTab: - info = fmt.Sprintf("%.f%%", r.boxes[readmeTab].(*code.Code).ScrollPercent()*100) + info = fmt.Sprintf("☰ %.f%%", r.boxes[readmeTab].(*code.Code).ScrollPercent()*100) default: value = r.boxes[r.activeTab].(statusbar.Model).StatusBarValue() info = r.boxes[r.activeTab].(statusbar.Model).StatusBarInfo()