Skip to content

fix: align server alias #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leoncamel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: align server alias #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion internal/adapters/ui/server_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package ui
import (
"github.com/Adembc/lazyssh/internal/core/domain"
"github.com/gdamore/tcell/v2"
"github.com/mattn/go-runewidth"
"github.com/rivo/tview"
)

Expand Down Expand Up @@ -71,8 +72,17 @@ func (sl *ServerList) UpdateServers(servers []domain.Server) {
sl.servers = servers
sl.List.Clear()

// Calculate the maximum alias width for alignment
maxAliasWidth := 0
for _, s := range servers {
width := runewidth.StringWidth(s.Alias)
if width > maxAliasWidth {
maxAliasWidth = width
}
}

for i := range servers {
primary, secondary := formatServerLine(servers[i])
primary, secondary := formatServerLine(servers[i], maxAliasWidth)
idx := i
sl.List.AddItem(primary, secondary, 0, func() {
if sl.onSelection != nil {
Expand Down
11 changes: 9 additions & 2 deletions internal/adapters/ui/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func pinnedIcon(pinnedAt time.Time) string {
return "📌" // pinned
}

func formatServerLine(s domain.Server) (primary, secondary string) {
func formatServerLine(s domain.Server, maxAliasWidth int) (primary, secondary string) {
icon := cellPad(pinnedIcon(s.PinnedAt), 2)
// forwarding column after Host/IP
fGlyph := ""
Expand All @@ -93,8 +93,15 @@ func formatServerLine(s domain.Server) (primary, secondary string) {
if isFwd {
fCol = "[#A0FFA0]" + fCol + "[-]"
}
// Calculate the actual display width of the alias
aliasWidth := runewidth.StringWidth(s.Alias)
// Pad the alias to match maxAliasWidth
paddedAlias := s.Alias
if aliasWidth < maxAliasWidth {
paddedAlias = s.Alias + strings.Repeat(" ", maxAliasWidth-aliasWidth)
}
// Use a consistent color for alias; host/IP fixed width; then forwarding column
primary = fmt.Sprintf("%s [white::b]%-12s[-] [#AAAAAA]%-18s[-] %s [#888888]Last SSH: %s[-] %s", icon, s.Alias, s.Host, fCol, humanizeDuration(s.LastSeen), renderTagBadgesForList(s.Tags))
primary = fmt.Sprintf("%s [white::b]%s[-] [#AAAAAA]%-18s[-] %s [#888888]Last SSH: %-8s[-] %s", icon, paddedAlias, s.Host, fCol, humanizeDuration(s.LastSeen), renderTagBadgesForList(s.Tags))
secondary = ""
return
}
Expand Down