diff --git a/ui/components/code/code.go b/ui/components/code/code.go index bf59225d0b831c8d19c687f3313facabf4ee4de2..b5bdf7c2257e251bc299bf91114993e273b32bba 100644 --- a/ui/components/code/code.go +++ b/ui/components/code/code.go @@ -164,9 +164,8 @@ func (r *Code) ScrollPercent() float64 { func (r *Code) glamourize(w int, md string) (string, error) { r.renderMutex.Lock() defer r.renderMutex.Unlock() - // This fixes a bug with markdown text wrapping being off by one. - if w > 0 { - w-- + if w > 120 { + w = 120 } tr, err := glamour.NewTermRenderer( glamour.WithStyles(r.styleConfig), diff --git a/ui/pages/repo/files.go b/ui/pages/repo/files.go index c2e08c0098f7eec84f61d38ab975ac2449d1dee0..065c491f76d3d036e050eb182230b933efb0b2d5 100644 --- a/ui/pages/repo/files.go +++ b/ui/pages/repo/files.go @@ -307,7 +307,7 @@ 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) default: diff --git a/ui/pages/repo/filesitem.go b/ui/pages/repo/filesitem.go index 0a9de1f5aa91f3ef6aead241c24eee025798fb26..9f94b455cae40fbfddca906e9badc9430ff8c619 100644 --- a/ui/pages/repo/filesitem.go +++ b/ui/pages/repo/filesitem.go @@ -104,6 +104,7 @@ func (d FileItemDelegate) Render(w io.Writer, m list.Model, index int, listItem name := i.Title() size := humanize.Bytes(uint64(i.entry.Size())) + size = strings.ReplaceAll(size, " ", "") sizeLen := lipgloss.Width(size) if i.entry.IsTree() { size = strings.Repeat(" ", sizeLen) diff --git a/ui/pages/repo/repo.go b/ui/pages/repo/repo.go index dc6b1f0b96f72fe8d0308864c717ebbc11b531c8..e5f7f4906e1aa5f9160f8b80e8105c4cb2e03ee8 100644 --- a/ui/pages/repo/repo.go +++ b/ui/pages/repo/repo.go @@ -273,9 +273,12 @@ func (r *Repo) headerView() string { name := r.common.Styles.RepoHeaderName.Render(r.selectedRepo.Name()) desc := r.selectedRepo.Description() if desc == "" { - desc = "No description" + desc = name + name = "" + } else { + desc = r.common.Styles.RepoHeaderDesc.Render(desc) } - desc = r.common.Styles.RepoHeaderDesc.Render(desc) + // TODO move this into a style. urlStyle := lipgloss.NewStyle(). MarginLeft(1). Foreground(lipgloss.Color("168")). @@ -283,7 +286,6 @@ func (r *Repo) headerView() string { Align(lipgloss.Right) url := git.RepoURL(cfg.Host, cfg.Port, r.selectedRepo.Repo()) url = common.TruncateString(url, r.common.Width-lipgloss.Width(desc)-1) - // TODO move this into a style. url = urlStyle.Render(url) style := r.common.Styles.RepoHeader.Copy().Width(r.common.Width) return style.Render( diff --git a/ui/styles/styles.go b/ui/styles/styles.go index 74bfb932dd2adcdc399be433892ca4ac7983a64c..ad217fedc8c03ea15048c404e73d8ec1bbf320c6 100644 --- a/ui/styles/styles.go +++ b/ui/styles/styles.go @@ -113,6 +113,7 @@ func DefaultStyles() *Styles { Foreground(lipgloss.Color("15")). Align(lipgloss.Left). Height(1). + PaddingLeft(1). MarginBottom(1). Bold(true)