_
/
aerc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Expand compose focus handling a bit

This commit is contained in:
Drew DeVault 2019-05-12 00:38:48 -04:00
parent 577248f5e1
commit 2a4dd5cb87
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
widgets/compose.go
View File

@ -10,7 +10,6 @@ import (
) )
type headerEditor struct { type headerEditor struct {
ui.Invalidatable
name string name string
input *ui.TextInput input *ui.TextInput
} }
@ -48,9 +47,12 @@ func NewComposer() *Composer {
{ui.SIZE_WEIGHT, 1}, {ui.SIZE_WEIGHT, 1},
}) })
headers.AddChild(newHeaderEditor("To", "Simon Ser <contact@emersion.fr>")).At(0, 0) to := newHeaderEditor("To", "")
headers.AddChild(newHeaderEditor("From", "Drew DeVault <sir@cmpwn.com>")).At(0, 1) from := newHeaderEditor("From", "")
headers.AddChild(newHeaderEditor("Subject", "Re: [PATCH RFC aerc2] widgets: fix StatusLine race")).At(1, 0).Span(1, 2) subject := newHeaderEditor("Subject", "")
headers.AddChild(to).At(0, 0)
headers.AddChild(from).At(0, 1)
headers.AddChild(subject).At(1, 0).Span(1, 2)
headers.AddChild(ui.NewFill(' ')).At(2, 0).Span(1, 2) headers.AddChild(ui.NewFill(' ')).At(2, 0).Span(1, 2)
// TODO: built-in config option, $EDITOR, then vi, in that order // TODO: built-in config option, $EDITOR, then vi, in that order
@ -62,10 +64,14 @@ func NewComposer() *Composer {
grid.AddChild(term).At(1, 0) grid.AddChild(term).At(1, 0)
return &Composer{ return &Composer{
grid: grid, grid: grid,
editor: term, editor: term,
focused: 0, // You have to backtab to get to "From", since you usually don't edit it
focused: 3,
focusable: []ui.DrawableInteractive{ focusable: []ui.DrawableInteractive{
from,
to,
subject,
term, term,
}, },
} }
@ -85,24 +91,15 @@ func (c *Composer) OnInvalidate(fn func(d ui.Drawable)) {
}) })
} }
// TODO: Focus various fields separately
// TODO: Consider having a different set of keybindings for a focused and
// unfocused terminal?
func (c *Composer) Event(event tcell.Event) bool { func (c *Composer) Event(event tcell.Event) bool {
if c.editor != nil { return c.focusable[c.focused].Event(event)
return c.editor.Event(event)
}
return false
} }
func (c *Composer) Focus(focus bool) { func (c *Composer) Focus(focus bool) {
if c.editor != nil { c.focusable[c.focused].Focus(focus)
c.editor.Focus(focus)
}
} }
func newHeaderEditor(name string, value string) *headerEditor { func newHeaderEditor(name string, value string) *headerEditor {
// TODO: Set default vaule to something sane, I guess
return &headerEditor{ return &headerEditor{
input: ui.NewTextInput(value), input: ui.NewTextInput(value),
name: name, name: name,
@ -118,5 +115,19 @@ func (he *headerEditor) Draw(ctx *ui.Context) {
} }
func (he *headerEditor) Invalidate() { func (he *headerEditor) Invalidate() {
he.DoInvalidate(he) he.input.Invalidate()
}
func (he *headerEditor) OnInvalidate(fn func(ui.Drawable)) {
he.input.OnInvalidate(func(_ ui.Drawable) {
fn(he)
})
}
func (he *headerEditor) Focus(focused bool) {
he.input.Focus(focused)
}
func (he *headerEditor) Event(event tcell.Event) bool {
return he.input.Event(event)
} }