git.iko.soy/crush
on main help sign in
feat: render scrollbar for model list (dialog and onboarding) (#2978)
commitce395837b7f584d025574fab7939fc37a445fae1 authorAndrey Nering <andreynering@users.noreply.github.com> dateFri 22 May 2026, 15:33 (5 months ago) parenta15a407
3 files changed+39−2
compare with main
unifiedsplit
internal/ui/common/scrollbar.go+1−1 internal/ui/dialog/models.go+11−1 internal/ui/list/list.go+27
internal/ui/common/scrollbar.go+1−1
@@ -23,7 +23,7 @@ func Scrollbar(s *styles.Styles, height, contentSize, viewportSize, offset int)
2323 }
2424
2525 // Calculate where the thumb starts.
26− trackSpace := height - thumbSize
26+ trackSpace := height - thumbSize + 1
2727 thumbPos := 0
2828 if trackSpace > 0 && maxOffset > 0 {
2929 thumbPos = min(trackSpace, offset*trackSpace/maxOffset)
internal/ui/dialog/models.go+11−1
@@ -10,6 +10,7 @@ import (
1010 "charm.land/bubbles/v2/textinput"
1111 tea "charm.land/bubbletea/v2"
1212 "charm.land/catwalk/pkg/catwalk"
13+ "charm.land/lipgloss/v2"
1314 "github.com/charmbracelet/crush/internal/config"
1415 "github.com/charmbracelet/crush/internal/ui/common"
1516 "github.com/charmbracelet/crush/internal/ui/util"
@@ -265,9 +266,14 @@ func (m *Models) Draw(scr uv.Screen, area uv.Rectangle) *tea.Cursor {
265266 t.Dialog.View.GetVerticalFrameSize()
266267
267268 m.input.SetWidth(max(0, innerWidth-t.Dialog.InputPrompt.GetHorizontalFrameSize()-1)) // (1) cursor padding
268− m.list.SetSize(innerWidth, height-heightOffset)
269269 m.help.SetWidth(innerWidth)
270270
271+ listHeight := height - heightOffset
272+ m.list.SetSize(innerWidth, listHeight)
273+ listTotalHeight := m.list.TotalHeight()
274+ listWidth := max(0, innerWidth-3) // Reserve space for scrollbar.
275+ m.list.SetSize(listWidth, listHeight)
276+
271277 rc := NewRenderContext(t, width)
272278 rc.Title = "Switch Model"
273279 rc.TitleInfo = m.modelTypeRadioView()
@@ -281,6 +287,10 @@ func (m *Models) Draw(scr uv.Screen, area uv.Rectangle) *tea.Cursor {
281287 rc.AddPart(inputView)
282288
283289 listView := t.Dialog.List.Height(m.list.Height()).Render(m.list.Render())
290+ scrollbar := common.Scrollbar(t, listHeight, listTotalHeight, listHeight, m.list.Offset())
291+ if scrollbar != "" {
292+ listView = lipgloss.JoinHorizontal(lipgloss.Top, listView, scrollbar)
293+ }
284294 rc.AddPart(listView)
285295
286296 rc.Help = m.help.View(m)
internal/ui/list/list.go+27
@@ -157,6 +157,33 @@ func (l *List) Len() int {
157157 return len(l.items)
158158}
159159
160+// TotalHeight returns the total height of all items in the list.
161+func (l *List) TotalHeight() int {
162+ total := 0
163+ for idx := range l.items {
164+ item := l.getItem(idx)
165+ total += item.height
166+ if l.gap > 0 && idx < len(l.items)-1 {
167+ total += l.gap
168+ }
169+ }
170+ return total
171+}
172+
173+// Offset returns the current scroll offset in lines from the top.
174+func (l *List) Offset() int {
175+ offset := 0
176+ for idx := 0; idx < l.offsetIdx; idx++ {
177+ item := l.getItem(idx)
178+ offset += item.height
179+ if l.gap > 0 && idx < len(l.items)-1 {
180+ offset += l.gap
181+ }
182+ }
183+ offset += l.offsetLine
184+ return offset
185+}
186+
160187// lastOffsetItem returns the index and line offsets of the last item that can
161188// be partially visible in the viewport.
162189func (l *List) lastOffsetItem() (int, int, int) {