1
0
mirror of https://github.com/tw93/Mole.git synced 2026-03-23 02:35:07 +00:00

fix(status): keep compact header single-line on tight widths

This commit is contained in:
tw93
2026-02-27 10:07:44 +08:00
parent f4118dc883
commit bbe3d3f284
2 changed files with 53 additions and 13 deletions

View File

@@ -167,27 +167,39 @@ func renderHeader(m MetricsSnapshot, errMsg string, animFrame int, termWidth int
if m.Hardware.RefreshRate != "" {
infoParts = append(infoParts, m.Hardware.RefreshRate)
}
optionalInfoParts := []string{}
if !compactHeader && m.Hardware.OSVersion != "" {
infoParts = append(infoParts, m.Hardware.OSVersion)
optionalInfoParts = append(optionalInfoParts, m.Hardware.OSVersion)
}
if !compactHeader && m.Uptime != "" {
infoParts = append(infoParts, subtleStyle.Render("up "+m.Uptime))
optionalInfoParts = append(optionalInfoParts, subtleStyle.Render("up "+m.Uptime))
}
headLeft := title + " " + scoreText
baseLines := wrapToWidth(headLeft, termWidth)
headerLines := append([]string{}, baseLines...)
if len(infoParts) > 0 {
headRight := strings.Join(infoParts, " · ")
combined := headLeft + " " + headRight
if lipgloss.Width(combined) <= termWidth {
headerLines = wrapToWidth(combined, termWidth)
} else {
wrappedRight := wrapToWidth(headRight, termWidth)
headerLines = append(baseLines, wrappedRight...)
headerLine := headLeft
if termWidth > 0 && lipgloss.Width(headerLine) > termWidth {
headerLine = wrapToWidth(headLeft, termWidth)[0]
}
if termWidth > 0 {
allParts := append(append([]string{}, infoParts...), optionalInfoParts...)
if len(allParts) > 0 {
combined := headLeft + " " + strings.Join(allParts, " · ")
if lipgloss.Width(combined) <= termWidth {
headerLine = combined
} else {
// When width is tight, drop lower-priority tail (OS and uptime) as a group.
fitParts := append([]string{}, infoParts...)
for len(fitParts) > 0 {
candidate := headLeft + " " + strings.Join(fitParts, " · ")
if lipgloss.Width(candidate) <= termWidth {
headerLine = candidate
break
}
fitParts = fitParts[:len(fitParts)-1]
}
}
}
}
headerLine := lipgloss.JoinVertical(lipgloss.Left, headerLines...)
// Show cat unless hidden - render mole centered below header
var mole string