From 8a2048e7f6c77902f3d78b0fb977de258f168457 Mon Sep 17 00:00:00 2001 From: Zachary Yedidia Date: Mon, 24 Feb 2020 13:45:10 -0500 Subject: [PATCH] Use tabbar color group, and mark modified tabs Fixes #1523 --- internal/action/bufpane.go | 6 +++++- internal/display/tabwindow.go | 11 ++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/internal/action/bufpane.go b/internal/action/bufpane.go index d63f0a20..7351f1f7 100644 --- a/internal/action/bufpane.go +++ b/internal/action/bufpane.go @@ -270,7 +270,11 @@ func (h *BufPane) SetID(i uint64) { } func (h *BufPane) Name() string { - return h.Buf.GetName() + n := h.Buf.GetName() + if h.Buf.Modified() { + n += " +" + } + return n } // HandleEvent executes the tcell event properly diff --git a/internal/display/tabwindow.go b/internal/display/tabwindow.go index 0b26fd7b..94bdc23a 100644 --- a/internal/display/tabwindow.go +++ b/internal/display/tabwindow.go @@ -96,6 +96,11 @@ func (w *TabWindow) Display() { x := -w.hscroll done := false + tabBarStyle := config.DefStyle.Reverse(true) + if style, ok := config.Colorscheme["tabbar"]; ok { + tabBarStyle = style + } + draw := func(r rune, n int) { for i := 0; i < n; i++ { rw := runewidth.RuneWidth(r) @@ -105,13 +110,13 @@ func (w *TabWindow) Display() { c = ' ' } if x == w.Width-1 && !done { - screen.SetContent(w.Width-1, w.Y, '>', nil, config.DefStyle.Reverse(true)) + screen.SetContent(w.Width-1, w.Y, '>', nil, tabBarStyle) x++ break } else if x == 0 && w.hscroll > 0 { - screen.SetContent(0, w.Y, '<', nil, config.DefStyle.Reverse(true)) + screen.SetContent(0, w.Y, '<', nil, tabBarStyle) } else if x >= 0 && x < w.Width { - screen.SetContent(x, w.Y, c, nil, config.DefStyle.Reverse(true)) + screen.SetContent(x, w.Y, c, nil, tabBarStyle) } x++ }