edd48c9981
The split command allows delta size changes, which triggers a condition where the split can overflow into the dirlist. Clamp the minimum size of a split or vsplit to "1" to prevent the view from overflowing, or completely covering the message list. A split of 0 will still clear the split. Reported-by: Koni Marti <koni.marti@gmail.com> Signed-off-by: Tim Culverhouse <tim@timculverhouse.com> Acked-by: Robin Jarry <robin@jarry.cc>
69 lines
1.2 KiB
Go
69 lines
1.2 KiB
Go
package account
|
|
|
|
import (
|
|
"errors"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"git.sr.ht/~rjarry/aerc/widgets"
|
|
)
|
|
|
|
type Split struct{}
|
|
|
|
func init() {
|
|
register(Split{})
|
|
}
|
|
|
|
func (Split) Aliases() []string {
|
|
return []string{"split", "vsplit"}
|
|
}
|
|
|
|
func (Split) Complete(aerc *widgets.Aerc, args []string) []string {
|
|
return nil
|
|
}
|
|
|
|
func (Split) Execute(aerc *widgets.Aerc, args []string) error {
|
|
if len(args) > 2 {
|
|
return errors.New("Usage: [v]split n")
|
|
}
|
|
acct := aerc.SelectedAccount()
|
|
if acct == nil {
|
|
return errors.New("No account selected")
|
|
}
|
|
if acct.Messages().Empty() {
|
|
return nil
|
|
}
|
|
n := 0
|
|
var err error
|
|
if len(args) > 1 {
|
|
delta := false
|
|
if strings.HasPrefix(args[1], "+") || strings.HasPrefix(args[1], "-") {
|
|
delta = true
|
|
}
|
|
n, err = strconv.Atoi(args[1])
|
|
if err != nil {
|
|
return errors.New("Usage: [v]split n")
|
|
}
|
|
if delta {
|
|
n = acct.SplitSize() + n
|
|
// Maintain split direction when using deltas
|
|
if acct.SplitSize() > 0 {
|
|
args[0] = acct.SplitDirection()
|
|
}
|
|
}
|
|
}
|
|
if n == acct.SplitSize() {
|
|
// Repeated commands of the same size have the effect of
|
|
// toggling the split
|
|
n = 0
|
|
}
|
|
if n < 0 {
|
|
// Don't allow split to go negative
|
|
n = 1
|
|
}
|
|
if args[0] == "split" {
|
|
return acct.Split(n)
|
|
}
|
|
return acct.Vsplit(n)
|
|
}
|