From 753adb90692e4821f8caea1d5d86cd69e312efa7 Mon Sep 17 00:00:00 2001 From: Kevin Kuehler Date: Sat, 1 Jun 2019 22:15:04 -0700 Subject: widget: Add ProvidesMessage interface Consists of 3 functions * Store: Access to MessageStore type * SelectedAccount: Access to Account widget that the target widget belongs to * SelectedMessage: Current message (selected in msglist or the one we are viewing) Signed-off-by: Kevin Kuehler --- widgets/account.go | 12 ++++++++++++ widgets/msgviewer.go | 16 +++++++++++++++- widgets/providesmessage.go | 14 ++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 widgets/providesmessage.go (limited to 'widgets') diff --git a/widgets/account.go b/widgets/account.go index f553a92..4526c02 100644 --- a/widgets/account.go +++ b/widgets/account.go @@ -157,6 +157,18 @@ func (acct *AccountView) Messages() *MessageList { return acct.msglist } +func (acct *AccountView) Store() *lib.MessageStore { + return acct.msglist.Store() +} + +func (acct *AccountView) SelectedMessage() *types.MessageInfo { + return acct.msglist.Selected() +} + +func (acct *AccountView) SelectedAccount() *AccountView { + return acct +} + func (acct *AccountView) onMessage(msg types.WorkerMessage) { switch msg := msg.(type) { case *types.Done: diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go index cf360bc..9230ba3 100644 --- a/widgets/msgviewer.go +++ b/widgets/msgviewer.go @@ -24,6 +24,7 @@ import ( type MessageViewer struct { ui.Invalidatable + acct *AccountView conf *config.AercConfig err error grid *ui.Grid @@ -55,7 +56,7 @@ func formatAddresses(addrs []*imap.Address) string { return val.String() } -func NewMessageViewer(conf *config.AercConfig, +func NewMessageViewer(acct *AccountView, conf *config.AercConfig, store *lib.MessageStore, msg *types.MessageInfo) *MessageViewer { grid := ui.NewGrid().Rows([]ui.GridSpec{ @@ -124,6 +125,7 @@ func NewMessageViewer(conf *config.AercConfig, grid.AddChild(switcher).At(1, 0) return &MessageViewer{ + acct: acct, grid: grid, msg: msg, store: store, @@ -185,6 +187,18 @@ func (mv *MessageViewer) OnInvalidate(fn func(d ui.Drawable)) { }) } +func (mv *MessageViewer) Store() *lib.MessageStore { + return mv.store +} + +func (mv *MessageViewer) SelectedAccount() *AccountView { + return mv.acct +} + +func (mv *MessageViewer) SelectedMessage() *types.MessageInfo { + return mv.msg +} + func (mv *MessageViewer) CurrentPart() *PartInfo { switcher := mv.switcher part := switcher.parts[switcher.selected] diff --git a/widgets/providesmessage.go b/widgets/providesmessage.go new file mode 100644 index 0000000..341f83f --- /dev/null +++ b/widgets/providesmessage.go @@ -0,0 +1,14 @@ +package widgets + +import ( + "git.sr.ht/~sircmpwn/aerc/worker/types" + "git.sr.ht/~sircmpwn/aerc/lib" + "git.sr.ht/~sircmpwn/aerc/lib/ui" +) + +type ProvidesMessage interface { + ui.Drawable + Store() *lib.MessageStore + SelectedMessage() *types.MessageInfo + SelectedAccount() *AccountView +} -- cgit 1.4.1-2-gfad0