diff --git a/ui/pages/repo/refsitem.go b/ui/pages/repo/refsitem.go index eb07f7044293e045ade31f822be75f7d7c28db54..cfae1a3d4aaf12e3293d20f818269d9b1f99a29e 100644 --- a/ui/pages/repo/refsitem.go +++ b/ui/pages/repo/refsitem.go @@ -98,13 +98,13 @@ func (d RefItemDelegate) Render(w io.Writer, m list.Model, index int, listItem l isActive := index == m.Index() if isTag && isActive { - st = s.ItemTagActive + st = s.Active.ItemTag } else if isTag { - st = s.ItemTagInactive + st = s.Normal.ItemTag } else if isActive { - st = s.ItemActive + st = s.Active.Item } else { - st = s.ItemInactive + st = s.Normal.Item } if isActive { @@ -118,7 +118,7 @@ func (d RefItemDelegate) Render(w io.Writer, m list.Model, index int, listItem l refMaxWidth := m.Width() - s.ItemSelector.GetMarginLeft() - s.ItemSelector.GetWidth() - - s.ItemInactive.GetMarginLeft() + s.Normal.Item.GetMarginLeft() ref = common.TruncateString(ref, refMaxWidth) ref = st.Render(ref) fmt.Fprint(w, selector, ref) diff --git a/ui/styles/styles.go b/ui/styles/styles.go index f14ec339e88b6512ac9b5a3ce35a8b0ca156a035..d52621e20d27e286bb171ca5929b3cb04276767a 100644 --- a/ui/styles/styles.go +++ b/ui/styles/styles.go @@ -75,13 +75,17 @@ type Styles struct { } Ref struct { - ItemSelector lipgloss.Style - ItemActive lipgloss.Style - ItemInactive lipgloss.Style - ItemBranch lipgloss.Style - ItemTagInactive lipgloss.Style - ItemTagActive lipgloss.Style - Paginator lipgloss.Style + Normal struct { + Item lipgloss.Style + ItemTag lipgloss.Style + } + Active struct { + Item lipgloss.Style + ItemTag lipgloss.Style + } + ItemSelector lipgloss.Style + ItemBranch lipgloss.Style + Paginator lipgloss.Style } Tree struct { @@ -292,25 +296,25 @@ func DefaultStyles() *Styles { Margin(0). Align(lipgloss.Center) - s.Ref.ItemInactive = lipgloss.NewStyle() + s.Ref.Normal.Item = lipgloss.NewStyle() s.Ref.ItemSelector = lipgloss.NewStyle(). Foreground(selectorColor). SetString("> ") - s.Ref.ItemActive = s.Ref.ItemActive.Copy(). + s.Ref.Active.Item = lipgloss.NewStyle(). Foreground(highlightColorDim) s.Ref.ItemBranch = lipgloss.NewStyle() - s.Ref.ItemTagInactive = lipgloss.NewStyle(). + s.Ref.Normal.ItemTag = lipgloss.NewStyle(). Foreground(lipgloss.Color("185")) - s.Ref.ItemTagActive = lipgloss.NewStyle(). + s.Ref.Active.ItemTag = lipgloss.NewStyle(). Bold(true). Foreground(highlightColor) - s.Ref.ItemActive = lipgloss.NewStyle(). + s.Ref.Active.Item = lipgloss.NewStyle(). Bold(true). Foreground(highlightColor)