aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoni Marti <koni.marti@gmail.com>2022-10-20 23:55:27 +0200
committerRobin Jarry <robin@jarry.cc>2022-10-26 00:19:48 +0200
commitb860a64622bfd10d34d24759e24cefa0221ebc5a (patch)
tree8348bef0d4be28476f3894672956befa282fb6df
parent8153f59188bfb62a944a731fcffc78670085b675 (diff)
downloadaerc-b860a64622bfd10d34d24759e24cefa0221ebc5a.tar.gz
listbox: implement horizontal scrolling
Implement horizontal scrolling for selected lines that are longer than dialog width. The following keys can be used: Ctrl-a, Home jump to beginning of line Ctrl-e, End jump to end of line Left move one character back Right move one character forward Ctrl+b move one word back Ctrl+w move one word forward Signed-off-by: Koni Marti <koni.marti@gmail.com> Acked-by: Robin Jarry <robin@jarry.cc>
-rw-r--r--CHANGELOG.md2
-rw-r--r--widgets/listbox.go63
2 files changed, 64 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e58e273..9eb86e64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- `:pipe -m git am -3` on patch series when `Message-Id` headers have not been
generated by `git send-email`.
+- Overflowing text in header editors while composing can now be scrolled
+ horizontally.
## [0.13.0](https://git.sr.ht/~rjarry/aerc/refs/0.13.0) - 2022-10-20
diff --git a/widgets/listbox.go b/widgets/listbox.go
index d1f1b252..8f4f7123 100644
--- a/widgets/listbox.go
+++ b/widgets/listbox.go
@@ -9,6 +9,7 @@ import (
"git.sr.ht/~rjarry/aerc/lib/ui"
"git.sr.ht/~rjarry/aerc/logging"
"github.com/gdamore/tcell/v2"
+ "github.com/mattn/go-runewidth"
)
type ListBox struct {
@@ -17,6 +18,7 @@ type ListBox struct {
lines []string
selected string
cursorPos int
+ horizPos int
jump int
showCursor bool
showFilter bool
@@ -109,6 +111,17 @@ func (lb *ListBox) moveCursor(delta int) {
}
lb.selected = list[lb.cursorPos]
lb.showCursor = true
+ lb.horizPos = 0
+}
+
+func (lb *ListBox) moveHorizontal(delta int) {
+ lb.horizPos += delta
+ if lb.horizPos > len(lb.selected) {
+ lb.horizPos = len(lb.selected)
+ }
+ if lb.horizPos < 0 {
+ lb.horizPos = 0
+ }
}
func (lb *ListBox) filtered() []string {
@@ -157,10 +170,22 @@ func (lb *ListBox) drawBox(ctx *ui.Context) {
y := 0
for i := lb.Scroll(); i < len(list) && y < h; i++ {
style := defaultStyle
+ line := runewidth.Truncate(list[i], w-1, "❯")
if lb.selected == list[i] && lb.showCursor {
style = selectedStyle
+ if len(list[i]) > w {
+ if len(list[i])-lb.horizPos < w {
+ lb.horizPos = len(list[i]) - w + 1
+ }
+ rest := list[i][lb.horizPos:]
+ line = runewidth.Truncate(rest,
+ w-1, "❯")
+ if lb.horizPos > 0 && len(line) > 0 {
+ line = "❮" + line[1:]
+ }
+ }
}
- ctx.Printf(1, y, style, list[i])
+ ctx.Printf(1, y, style, line)
y += 1
}
@@ -191,6 +216,42 @@ func (lb *ListBox) Invalidate() {
func (lb *ListBox) Event(event tcell.Event) bool {
if event, ok := event.(*tcell.EventKey); ok {
switch event.Key() {
+ case tcell.KeyLeft:
+ lb.moveHorizontal(-1)
+ lb.Invalidate()
+ return true
+ case tcell.KeyRight:
+ lb.moveHorizontal(+1)
+ lb.Invalidate()
+ return true
+ case tcell.KeyCtrlB:
+ line := lb.selected[:lb.horizPos]
+ fds := strings.Fields(line)
+ if len(fds) > 1 {
+ lb.moveHorizontal(
+ strings.LastIndex(line,
+ fds[len(fds)-1]) - lb.horizPos - 1)
+ } else {
+ lb.horizPos = 0
+ }
+ lb.Invalidate()
+ return true
+ case tcell.KeyCtrlW:
+ line := lb.selected[lb.horizPos+1:]
+ fds := strings.Fields(line)
+ if len(fds) > 1 {
+ lb.moveHorizontal(strings.Index(line, fds[1]))
+ }
+ lb.Invalidate()
+ return true
+ case tcell.KeyCtrlA, tcell.KeyHome:
+ lb.horizPos = 0
+ lb.Invalidate()
+ return true
+ case tcell.KeyCtrlE, tcell.KeyEnd:
+ lb.horizPos = len(lb.selected)
+ lb.Invalidate()
+ return true
case tcell.KeyCtrlP, tcell.KeyUp:
lb.moveCursor(-1)
lb.Invalidate()