git.iko.soy/crush
on main help sign in
fix(ui): truncate status messages that would otherwise wrap (#2306)
655ce65Christian Rocha
internal/ui/model/status.go+4−2
compare with main
unifiedsplit
@@ -1,6 +1,7 @@
1package model
1package model
2
2
3import (
3import (
4+ "strings"
4 "time"
5 "time"
5
6
6 "charm.land/bubbles/v2/help"
7 "charm.land/bubbles/v2/help"
@@ -99,9 +100,10 @@ func (s *Status) Draw(scr uv.Screen, area uv.Rectangle) {
99 }
100 }
100
101
101 ind := indStyle.String()
102 ind := indStyle.String()
102− messageWidth := area.Dx() - lipgloss.Width(ind)
103+ messageWidth := max(0, area.Dx()-lipgloss.Width(ind)-msgStyle.GetHorizontalPadding())
103 msg := ansi.Truncate(s.msg.Msg, messageWidth, "…")
104 msg := ansi.Truncate(s.msg.Msg, messageWidth, "…")
105+ msg += strings.Repeat(" ", max(0, messageWidth-lipgloss.Width(msg)))
104− info := msgStyle.Width(messageWidth).Render(msg)
106+ info := msgStyle.Render(msg)
105
107
106 // Draw the info message over the help view
108 // Draw the info message over the help view
107 uv.NewStyledString(ind+info).Draw(scr, area)
109 uv.NewStyledString(ind+info).Draw(scr, area)