git.iko.soy/crush
on main help sign in
Merge pull request #281 from charmbracelet/charm-415
0e51a48Raphael Amorim
internal/tui/components/core/status/status.go+4−9
compare with main
unifiedsplit
@@ -1,14 +1,12 @@
1package status
1package status
2
2
3import (
3import (
4− "strings"
5 "time"
4 "time"
6
5
7 "github.com/charmbracelet/bubbles/v2/help"
6 "github.com/charmbracelet/bubbles/v2/help"
8 tea "github.com/charmbracelet/bubbletea/v2"
7 tea "github.com/charmbracelet/bubbletea/v2"
9 "github.com/charmbracelet/crush/internal/tui/styles"
8 "github.com/charmbracelet/crush/internal/tui/styles"
10 "github.com/charmbracelet/crush/internal/tui/util"
9 "github.com/charmbracelet/crush/internal/tui/util"
11− "github.com/charmbracelet/lipgloss/v2"
12 "github.com/charmbracelet/x/ansi"
10 "github.com/charmbracelet/x/ansi"
13)
11)
14
12
@@ -74,18 +72,15 @@ func (m *statusCmp) infoMsg() string {
74 switch m.info.Type {
72 switch m.info.Type {
75 case util.InfoTypeError:
73 case util.InfoTypeError:
76 infoType = t.S().Base.Background(t.Red).Padding(0, 1).Render("ERROR")
74 infoType = t.S().Base.Background(t.Red).Padding(0, 1).Render("ERROR")
77− width := m.width - lipgloss.Width(infoType)
78− message = t.S().Base.Background(t.Error).Foreground(t.White).Padding(0, 1).Width(width).Render(ansi.Truncate(m.info.Msg, width, "…"))
75+ message = t.S().Base.Background(t.Error).Foreground(t.White).Padding(0, 1).Render(m.info.Msg)
79 case util.InfoTypeWarn:
76 case util.InfoTypeWarn:
80 infoType = t.S().Base.Foreground(t.BgOverlay).Background(t.Yellow).Padding(0, 1).Render("WARNING")
77 infoType = t.S().Base.Foreground(t.BgOverlay).Background(t.Yellow).Padding(0, 1).Render("WARNING")
81− width := m.width - lipgloss.Width(infoType)
82− message = t.S().Base.Foreground(t.BgOverlay).Background(t.Warning).Padding(0, 1).Width(width).Render(ansi.Truncate(m.info.Msg, width, "…"))
78+ message = t.S().Base.Foreground(t.BgOverlay).Background(t.Warning).Padding(0, 1).Render(m.info.Msg)
83 default:
79 default:
84 infoType = t.S().Base.Foreground(t.BgOverlay).Background(t.Green).Padding(0, 1).Render("OKAY!")
80 infoType = t.S().Base.Foreground(t.BgOverlay).Background(t.Green).Padding(0, 1).Render("OKAY!")
85− width := m.width - lipgloss.Width(infoType)
86− message = t.S().Base.Background(t.Success).Foreground(t.White).Padding(0, 1).Width(width).Render(ansi.Truncate(m.info.Msg, width, "…"))
81+ message = t.S().Base.Background(t.Success).Foreground(t.White).Padding(0, 1).Render(m.info.Msg)
87 }
82 }
88− return strings.Join([]string{infoType, message}, "")
83+ return ansi.Truncate(infoType+message, m.width, "…")
89}
84}
90
85
91func (m *statusCmp) ToggleFullHelp() {
86func (m *statusCmp) ToggleFullHelp() {