From 75cbf767326dfc67325773850ab1f6451dc9fb14 Mon Sep 17 00:00:00 2001 From: Reto Brunner Date: Wed, 14 Oct 2020 08:42:26 +0200 Subject: refactor ParseMessageFormat to use a ctx object --- widgets/msglist.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'widgets') diff --git a/widgets/msglist.go b/widgets/msglist.go index 09b0868c..b7c10d7e 100644 --- a/widgets/msglist.go +++ b/widgets/msglist.go @@ -150,9 +150,14 @@ func (ml *MessageList) Draw(ctx *ui.Context) { ctx.Fill(0, row, ctx.Width(), 1, ' ', style) fmtStr, args, err := format.ParseMessageFormat( - ml.aerc.SelectedAccount().acct.From, - uiConfig.IndexFormat, - uiConfig.TimestampFormat, "", i, msg, store.IsMarked(uid)) + uiConfig.IndexFormat, uiConfig.TimestampFormat, + format.Ctx{ + FromAddress: ml.aerc.SelectedAccount().acct.From, + AccountName: ml.aerc.SelectedAccount().Name(), + MsgInfo: msg, + MsgNum: i, + MsgIsMarked: store.IsMarked(uid), + }) if err != nil { ctx.Printf(0, row, style, "%v", err) } else { -- cgit