diff options
| author | Koni Marti <koni.marti@gmail.com> | 2023-05-06 11:30:48 +0200 |
|---|---|---|
| committer | Robin Jarry <robin@jarry.cc> | 2023-05-16 17:12:00 +0200 |
| commit | 30c1a30168dfff8ca5eecb8d0fa42ab4b638f79d (patch) | |
| tree | 97d177a8e399ed7ad7f107b85df1cd4d246e50ff /widgets/dirlist.go | |
| parent | 6b6aaf3ae131971d05ab3f849ea3db14c6a6e055 (diff) | |
| download | aerc-30c1a30168dfff8ca5eecb8d0fa42ab4b638f79d.tar.gz | |
templates: use template interface consistently
Use the template interface consistently. Before, we have exported the
state.TemplateData struct and used it in most places instead of the
models.TemplateData interface. This lead to some inconsistencies, i.e.
Role() has been defined on the exported struct but not on the interface.
Unexport the state.TemplateData struct, add a DataSetter interface to
set the data needed for the template data and call the Data() method
which returns a models.TemplateData interface when the template data is
needed.
Signed-off-by: Koni Marti <koni.marti@gmail.com>
Acked-by: Tim Culverhouse <tim@timculverhouse.com>
Diffstat (limited to 'widgets/dirlist.go')
| -rw-r--r-- | widgets/dirlist.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/widgets/dirlist.go b/widgets/dirlist.go index 25d1e7ff..8112ebd2 100644 --- a/widgets/dirlist.go +++ b/widgets/dirlist.go @@ -238,8 +238,8 @@ func (dirlist *DirectoryList) Draw(ctx *ui.Context) { } listCtx := ctx.Subcontext(0, 0, textWidth, ctx.Height()) - var data state.TemplateData + data := state.NewDataSetter() data.SetAccount(dirlist.acctConf) for i, name := range dirlist.dirs { @@ -254,7 +254,7 @@ func (dirlist *DirectoryList) Draw(ctx *ui.Context) { data.SetFolder(dirlist.Directory(name)) data.SetRUE([]string{name}, dirlist.GetRUECount) left, right, style := dirlist.renderDir( - name, uiConfig, &data, + name, uiConfig, data.Data(), name == dirlist.selecting, listCtx.Width(), ) listCtx.Printf(0, row, style, "%s %s", left, right) @@ -267,7 +267,7 @@ func (dirlist *DirectoryList) Draw(ctx *ui.Context) { } func (dirlist *DirectoryList) renderDir( - path string, conf *config.UIConfig, data *state.TemplateData, + path string, conf *config.UIConfig, data models.TemplateData, selected bool, width int, ) (string, string, tcell.Style) { var left, right string |