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

Hopefully fixed regression in background styling for

Browse Source 
frequency/member/ban/signal lists
This commit is contained in:
Kyren223
2025-02-08 17:42:07 +02:00
parent 57441a44ac
commit 1f793312be
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/client/ui/core/banlist/banlist.go
View File

@@ -59,10 +59,10 @@ func (m Model) Init() tea.Cmd {
func (m Model) View() string {
memberStyle := lipgloss.NewStyle().Width(m.width-(margin*2)).
Background(colors.BackgroundDim).
Margin(0, margin).Padding(0, padding).Align(lipgloss.Left)
Margin(0, margin).Padding(0, padding).Align(lipgloss.Left).
Background(colors.BackgroundDim).MarginBackground(colors.BackgroundDim)
backgroundStyle := lipgloss.NewStyle().Background(colors.BackgroundDim)
backgroundWidthStyle := backgroundStyle.Width(m.width)
maxMemberWidth := m.width - widthWithoutMember
ownerId := state.State.Networks[m.networkId].OwnerID
@@ -121,7 +121,7 @@ func (m Model) View() string {
Render(memberName) + ellipsisStyle.Render(ellipsis)
}
builder.WriteString(backgroundWidthStyle.Render(memberStyle.Render(memberName)))
builder.WriteString(memberStyle.Render(memberName))
builder.WriteString("\n")
}

10
internal/client/ui/core/frequencylist/frequencylist.go
View File

@@ -71,7 +71,8 @@ func (m Model) View() string {
backgroundStyle := lipgloss.NewStyle().Background(colors.BackgroundDim)
frequencyStyle := lipgloss.NewStyle().
MaxHeight(1).Width(m.width-(margin*2)).
Margin(0, margin).Padding(0, padding).Align(lipgloss.Left)
Margin(0, margin).Padding(0, padding).Align(lipgloss.Left).
Background(colors.BackgroundDim).MarginBackground(colors.BackgroundDim)
maxFrequencyWidth := m.width - widthWithoutFrequency
isAdmin := state.State.Members[*networkId][*state.UserID].IsAdmin
@@ -86,10 +87,10 @@ func (m Model) View() string {
frequencies = frequencies[m.base:upper]
for i, frequency := range frequencies {
backgroundStyle := backgroundStyle.Width(m.width)
maxFrequencyWidth := maxFrequencyWidth
frequencyStyle := frequencyStyle.Foreground(lipgloss.Color(frequency.HexColor))
frequencyStyle := frequencyStyle.
Foreground(lipgloss.Color(frequency.HexColor))
if m.index == m.base+i {
frequencyStyle = frequencyStyle.Background(colors.BackgroundHighlight)
}
@@ -114,7 +115,6 @@ func (m Model) View() string {
Foreground(colors.White).Render(notifSymbol)
builder.WriteString(notifSymbol)
frequencyStyle = frequencyStyle.MarginLeft(margin - 1)
backgroundStyle = backgroundStyle.Width(m.width - 1)
if pings != 0 {
notif = notifs[min(pings, 10)-1]
@@ -137,7 +137,7 @@ func (m Model) View() string {
Render(frequencyName)
frequency := frequencyStyle.Render(symbol + frequencyName + notif)
builder.WriteString(backgroundStyle.Render(frequency))
builder.WriteString(frequency)
builder.WriteString("\n")
}

7
internal/client/ui/core/memberlist/memberlist.go
View File

@@ -70,8 +70,9 @@ func (m Model) View() string {
memberStyle := lipgloss.NewStyle().Width(m.width-(margin*2)).
Background(colors.BackgroundDim).
Margin(0, margin).Padding(0, padding).Align(lipgloss.Left)
backgroundWidtStyle := backgroundStyle.Width(m.width)
Margin(0, margin).Padding(0, padding).Align(lipgloss.Left).
Background(colors.BackgroundDim).MarginBackground(colors.BackgroundDim)
maxMemberWidth := m.width - widthWithoutMember
ownerId := state.State.Networks[*networkId].OwnerID
@@ -130,7 +131,7 @@ func (m Model) View() string {
Render(memberName) + ellipsisStyle.Render(ellipsis)
}
builder.WriteString(backgroundWidtStyle.Render(memberStyle.Render(memberName)))
builder.WriteString(memberStyle.Render(memberName))
builder.WriteString("\n")
}

6
internal/client/ui/core/signallist/signallist.go
View File

@@ -55,9 +55,9 @@ func (m Model) Init() tea.Cmd {
func (m Model) View() string {
signalStyle := lipgloss.NewStyle().Width(m.width-(margin*2)).
Margin(0, margin).Padding(0, padding).Align(lipgloss.Left)
Margin(0, margin).Padding(0, padding).Align(lipgloss.Left).
Background(colors.BackgroundDim).MarginBackground(colors.BackgroundDim)
backgroundStyle := lipgloss.NewStyle().Background(colors.BackgroundDim)
backgroundWidthStyle := backgroundStyle.Width(m.width)
maxUserWidth := m.width - widthWithoutUser
var builder strings.Builder
@@ -128,7 +128,7 @@ func (m Model) View() string {
}
signal := signalStyle.Render(username + notif)
builder.WriteString(backgroundWidthStyle.Render(signal))
builder.WriteString(signal)
builder.WriteString("\n")
}