From 8c805499ece9cd32121e2a3366e86558609cfc50 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Tue, 28 Jan 2025 19:48:18 +0200 Subject: Fixed incorrect rendering of peers in the user signals when they are trusted and their public key mismatches and also ellipsis when the username overflows the width --- internal/client/ui/core/peerlist/peerlist.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/internal/client/ui/core/peerlist/peerlist.go b/internal/client/ui/core/peerlist/peerlist.go index 0d8a678..dc2eaef 100644 --- a/internal/client/ui/core/peerlist/peerlist.go +++ b/internal/client/ui/core/peerlist/peerlist.go @@ -78,9 +78,6 @@ func (m Model) View() string { peers = peers[m.base:upper] for i, peer := range peers { peerStyle := peerStyle - if m.index == m.base+i { - peerStyle = peerStyle.Background(colors.BackgroundHighlight) - } user := state.State.Users[peer] trustedPublicKey, isTrusted := state.State.Trusteds[user.ID] @@ -88,9 +85,14 @@ func (m Model) View() string { var userStyle lipgloss.Style if isTrusted && keysMatch { - userStyle = ui.TrustedUserStyle + userStyle = ui.TrustedUserStyle.Background(colors.BackgroundDim) } else { - userStyle = ui.UserStyle + userStyle = ui.UserStyle.Background(colors.BackgroundDim) + } + + if m.index == m.base+i { + peerStyle = peerStyle.Background(colors.BackgroundHighlight) + userStyle = userStyle.Background(colors.BackgroundHighlight) } username := user.Name @@ -105,7 +107,8 @@ func (m Model) View() string { Render(username) } else { ellipsisStyle := lipgloss.NewStyle(). - Background(peerStyle.GetBackground()).Foreground(userStyle.GetForeground()) + Background(userStyle.GetBackground()). + Foreground(userStyle.GetForeground()) username = lipgloss.NewStyle(). MaxWidth(maxUserWidth-1). Render(username) + ellipsisStyle.Render(ellipsis) -- cgit v1.3.1