diff options
| author | Kyren223 <Kyren223@proton.me> | 2024-12-24 18:22:30 +0200 |
|---|---|---|
| committer | Kyren223 <Kyren223@proton.me> | 2024-12-24 18:22:30 +0200 |
| commit | d3d027f19eb8341eea4a321699ce1050de7cbfab (patch) | |
| tree | a610ffb53d2eaff79af24a7cc9c0346821c4e46f | |
| parent | 2d4b0df290a17b9f109443be177f2bed32a64641 (diff) | |
Fixed overflow in frequency list
| -rw-r--r-- | internal/client/ui/core/frequencycreation/frequencycreation.go | 4 | ||||
| -rw-r--r-- | internal/client/ui/core/frequencylist/frequencylist.go | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/internal/client/ui/core/frequencycreation/frequencycreation.go b/internal/client/ui/core/frequencycreation/frequencycreation.go index bb4d398..fb6d94f 100644 --- a/internal/client/ui/core/frequencycreation/frequencycreation.go +++ b/internal/client/ui/core/frequencycreation/frequencycreation.go @@ -87,7 +87,7 @@ func New(network snowflake.ID) Model { name.FocusedStyle = fieldFocusedStyle name.BlurredStyle = fieldBlurredStyle name.ErrorStyle = lipgloss.NewStyle().Foreground(colors.Error) - name.Input.CharLimit = width + name.Input.CharLimit = packet.MaxFrequencyName name.Focus() name.Input.Validate = func(s string) error { if strings.TrimSpace(s) == "" { @@ -116,7 +116,7 @@ func New(network snowflake.ID) Model { lastColor: lipgloss.Color("#" + color.Value()), perms: packet.PermReadWrite, create: blurredCreate, - network: network, + network: network, nameWidth: nameWidth, precomputedStyle: lipgloss.NewStyle().Width(nameWidth / 3), diff --git a/internal/client/ui/core/frequencylist/frequencylist.go b/internal/client/ui/core/frequencylist/frequencylist.go index d2e7dc5..a0d6cb7 100644 --- a/internal/client/ui/core/frequencylist/frequencylist.go +++ b/internal/client/ui/core/frequencylist/frequencylist.go @@ -19,7 +19,7 @@ var ( nameStyle = lipgloss.NewStyle(). Margin(0, 0, 1).Padding(1).Width(width).Align(lipgloss.Center). Border(lipgloss.ThickBorder(), false, false, true) - margin = 3 + margin = 2 frequencyStyle = lipgloss.NewStyle(). Margin(0, margin).Padding(0, 1).Width(width - (margin * 2)). Align(lipgloss.Left) @@ -67,7 +67,11 @@ func (m Model) View() string { if m.index == i { frequencyStyle = frequencyStyle.Background(colors.BackgroundHighlight) } - builder.WriteString(frequencyStyle.Render(symbol + frequency.Name)) + + frequencyName := lipgloss.NewStyle(). + MaxWidth(width - (margin * 2) - 4). + Render(frequency.Name) + builder.WriteString(frequencyStyle.Render(symbol + frequencyName)) builder.WriteString("\n") } |
