diff options
| author | Tim Culverhouse <tim@timculverhouse.com> | 2024-02-12 06:26:18 -0600 |
|---|---|---|
| committer | Robin Jarry <robin@jarry.cc> | 2024-02-12 13:48:47 +0100 |
| commit | f001f65240f85f0af91703dbcc0b068c0797297a (patch) | |
| tree | c3e7e60f6000137a766b0c2313ac4f27009fffa6 /app | |
| parent | 0fd5f4115792e706f73202d77fac404c0033333b (diff) | |
| download | aerc-f001f65240f85f0af91703dbcc0b068c0797297a.tar.gz | |
fill: replace tcell.Style with vaxis.Style
Replace the Fill implementation with vaxis style objects
Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
Acked-by: Robin Jarry <robin@jarry.cc>
Diffstat (limited to 'app')
| -rw-r--r-- | app/account-wizard.go | 2 | ||||
| -rw-r--r-- | app/aerc.go | 4 | ||||
| -rw-r--r-- | app/compose.go | 2 | ||||
| -rw-r--r-- | app/msgviewer.go | 5 |
4 files changed, 7 insertions, 6 deletions
diff --git a/app/account-wizard.go b/app/account-wizard.go index e47acc53..0fd426ca 100644 --- a/app/account-wizard.go +++ b/app/account-wizard.go @@ -128,7 +128,7 @@ func (s *configStep) Grid() *ui.Grid { grid := ui.NewGrid().Rows(spec).Columns([]ui.GridSpec{justify}) intro := ui.NewText(introduction, config.Ui.GetStyle(config.STYLE_DEFAULT)) - fill := ui.NewFill(' ', tcell.StyleDefault) + fill := ui.NewFill(' ', vaxis.Style{}) grid.AddChild(fill).At(0, 0) grid.AddChild(intro).At(1, 0) diff --git a/app/aerc.go b/app/aerc.go index f4ad531a..0efaab30 100644 --- a/app/aerc.go +++ b/app/aerc.go @@ -881,9 +881,9 @@ func errorScreen(s string) ui.Drawable { }).Columns([]ui.GridSpec{ {Strategy: ui.SIZE_WEIGHT, Size: ui.Const(1)}, }) - grid.AddChild(ui.NewFill(' ', tcell.StyleDefault)).At(0, 0) + grid.AddChild(ui.NewFill(' ', vaxis.Style{})).At(0, 0) grid.AddChild(text).At(1, 0) - grid.AddChild(ui.NewFill(' ', tcell.StyleDefault)).At(2, 0) + grid.AddChild(ui.NewFill(' ', vaxis.Style{})).At(2, 0) return grid } diff --git a/app/compose.go b/app/compose.go index 7bc3fd66..d56f15eb 100644 --- a/app/compose.go +++ b/app/compose.go @@ -1470,7 +1470,7 @@ func (c *Composer) updateGrid() { borderChar := c.acct.UiConfig().BorderCharHorizontal grid.AddChild(heditors).At(0, 0) grid.AddChild(c.crypto).At(1, 0) - grid.AddChild(ui.NewFill(borderChar, borderStyle)).At(2, 0) + grid.AddChild(ui.NewFill(borderChar, tcell.VaxisStyle(borderStyle))).At(2, 0) if c.review != nil { grid.AddChild(c.review).At(3, 0) } else if c.editor != nil { diff --git a/app/msgviewer.go b/app/msgviewer.go index a22d2c15..179deca4 100644 --- a/app/msgviewer.go +++ b/app/msgviewer.go @@ -13,6 +13,7 @@ import ( "github.com/danwakefield/fnmatch" "github.com/emersion/go-message/textproto" + "github.com/gdamore/tcell/v2" "github.com/mattn/go-runewidth" "git.sr.ht/~rjarry/aerc/config" @@ -145,10 +146,10 @@ func NewMessageViewer( grid.AddChild(header).At(0, 0) if msg.MessageDetails() != nil || acct.UiConfig().IconUnencrypted != "" { grid.AddChild(NewPGPInfo(msg.MessageDetails(), acct.UiConfig())).At(1, 0) - grid.AddChild(ui.NewFill(borderChar, borderStyle)).At(2, 0) + grid.AddChild(ui.NewFill(borderChar, tcell.VaxisStyle(borderStyle))).At(2, 0) grid.AddChild(switcher).At(3, 0) } else { - grid.AddChild(ui.NewFill(borderChar, borderStyle)).At(1, 0) + grid.AddChild(ui.NewFill(borderChar, tcell.VaxisStyle(borderStyle))).At(1, 0) grid.AddChild(switcher).At(2, 0) } |