mirror of
https://github.com/charmbracelet/crush.git
synced 2025-08-02 05:20:46 +03:00
fix(tui): status: properly truncate info messages
This commit is contained in:
@@ -1,14 +1,12 @@
|
||||
package status
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/charmbracelet/bubbles/v2/help"
|
||||
tea "github.com/charmbracelet/bubbletea/v2"
|
||||
"github.com/charmbracelet/crush/internal/tui/styles"
|
||||
"github.com/charmbracelet/crush/internal/tui/util"
|
||||
"github.com/charmbracelet/lipgloss/v2"
|
||||
"github.com/charmbracelet/x/ansi"
|
||||
)
|
||||
|
||||
@@ -74,18 +72,15 @@ func (m *statusCmp) infoMsg() string {
|
||||
switch m.info.Type {
|
||||
case util.InfoTypeError:
|
||||
infoType = t.S().Base.Background(t.Red).Padding(0, 1).Render("ERROR")
|
||||
width := m.width - lipgloss.Width(infoType)
|
||||
message = t.S().Base.Background(t.Error).Foreground(t.White).Padding(0, 1).Width(width).Render(ansi.Truncate(m.info.Msg, width, "…"))
|
||||
message = t.S().Base.Background(t.Error).Foreground(t.White).Padding(0, 1).Render(m.info.Msg)
|
||||
case util.InfoTypeWarn:
|
||||
infoType = t.S().Base.Foreground(t.BgOverlay).Background(t.Yellow).Padding(0, 1).Render("WARNING")
|
||||
width := m.width - lipgloss.Width(infoType)
|
||||
message = t.S().Base.Foreground(t.BgOverlay).Background(t.Warning).Padding(0, 1).Width(width).Render(ansi.Truncate(m.info.Msg, width, "…"))
|
||||
message = t.S().Base.Foreground(t.BgOverlay).Background(t.Warning).Padding(0, 1).Render(m.info.Msg)
|
||||
default:
|
||||
infoType = t.S().Base.Foreground(t.BgOverlay).Background(t.Green).Padding(0, 1).Render("OKAY!")
|
||||
width := m.width - lipgloss.Width(infoType)
|
||||
message = t.S().Base.Background(t.Success).Foreground(t.White).Padding(0, 1).Width(width).Render(ansi.Truncate(m.info.Msg, width, "…"))
|
||||
message = t.S().Base.Background(t.Success).Foreground(t.White).Padding(0, 1).Render(m.info.Msg)
|
||||
}
|
||||
return strings.Join([]string{infoType, message}, "")
|
||||
return ansi.Truncate(infoType+message, m.width, "…")
|
||||
}
|
||||
|
||||
func (m *statusCmp) ToggleFullHelp() {
|
||||
|
||||
Reference in New Issue
Block a user