Kyren223/eko
1
1
Fork 0
mirror of https://github.com/Kyren223/eko.git synced 2025-09-05 21:18:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed incorrect rendering of peers in the user signals when they are

Browse Source 
trusted and their public key mismatches and also ellipsis when the
username overflows the width
This commit is contained in:
Kyren223
2025-01-28 19:48:18 +02:00
parent f3bf8a9c5d
commit 8c805499ec
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/client/ui/core/peerlist/peerlist.go
View File

@@ -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)