fix: improve bufferline clarity

sho-87 · Jun 29, 2024 · 3f9d612 · 3f9d612
1 parent 9de2520
commit 3f9d612
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 24 deletions.
diff --git a/lua/kanagawa-paper/highlights/editor.lua b/lua/kanagawa-paper/highlights/editor.lua
@@ -124,9 +124,9 @@ function M.setup(colors, opts)
 		-- StatusLineNC	Status lines of not-current windows. Note: If this is equal to "StatusLine", Vim will use "^^^" in the status line of the current window.
 		StatusLineNC = { fg = theme.ui.nontext, bg = theme.ui.bg_m3 },
 		-- TabLine		Tab pages line, not active tab page label.
-		TabLine = { bg = theme.ui.bg_m3, fg = theme.ui.special },
+		TabLine = { bg = theme.ui.bg_tabline, fg = theme.ui.special },
 		-- TabLineFill	Tab pages line, where there are no labels.
-		TabLineFill = { bg = theme.ui.bg },
+		TabLineFill = { bg = theme.ui.bg_tabline },
 		-- TabLineSel	Tab pages line, active tab page label.
 		TabLineSel = { fg = theme.ui.fg_dim, bg = theme.ui.bg_p1 },
 		-- Title		Titles for output from ":set all", ":autocmd" etc.

diff --git a/lua/kanagawa-paper/highlights/plugins.lua b/lua/kanagawa-paper/highlights/plugins.lua
@@ -238,30 +238,20 @@ function M.setup(colors, opts)
 		RainbowDelimiterCyan = { fg = palette.dragonTeal },
 
 		-- Bufferline
+		BufferLineFill = { bg = theme.ui.bg_tabline },
 		BufferlineBufferSelected = { fg = palette.dragonWhite, bold = true },
 		BufferlineIndicatorSelected = { fg = palette.dragonBlue },
-		BufferlineModified = { fg = theme.vcs.changed },
+		BufferlineModified = { bg = not opts.transparent and theme.ui.bg_tabline or "NONE", fg = theme.vcs.changed },
 		BufferlineModifiedSelected = { fg = theme.vcs.changed },
-		BufferlineTabSelected = { bg = theme.ui.bg_p1, fg = palette.dragonWhite },
-		BufferlineTabSeparator = {
-			bg = not opts.transparent and theme.ui.bg_m3 or theme.ui.bg,
-			fg = not opts.transparent and theme.ui.bg_m3 or theme.ui.bg,
-		},
-		BufferlineTabSeparatorSelected = {
-			bg = theme.ui.bg_p1,
-			fg = not opts.transparent and theme.ui.bg_m3 or theme.ui.bg_p1,
-		},
-		BufferlineTabClose = { fg = palette.dragonRed },
-		BufferlineCloseButton = { fg = theme.ui.fg_dim, bg = not opts.transparent and theme.ui.bg_m3 or "NONE" },
+		BufferlineCloseButton = { bg = not opts.transparent and theme.ui.bg_tabline or "NONE", fg = theme.ui.fg_dim },
 		BufferlineCloseButtonSelected = { fg = palette.dragonRed },
-		BufferlineSeparator = {
-			fg = not opts.transparent and theme.ui.bg_m3 or theme.ui.bg,
-			bg = not opts.transparent and theme.ui.bg_m3 or "NONE",
-		},
-		BufferlineSeparatorSelected = {
-			fg = not opts.transparent and theme.ui.bg_m3 or theme.ui.bg,
-			bg = not opts.transparent and theme.ui.bg_m3 or "NONE",
-		},
+		BufferlineTab = { bg = theme.ui.bg_tabline, fg = theme.ui.fg_dim },
+		BufferlineTabClose = { bg = theme.ui.bg_p1, fg = palette.dragonRed },
+		BufferlineTabSelected = { bg = theme.ui.bg_p1, fg = palette.dragonWhite, bold = true },
+		BufferlineTabSeparator = { bg = theme.ui.bg_tabline, fg = theme.ui.bg_tabline },
+		BufferlineTabSeparatorSelected = { bg = theme.ui.bg_tabline, fg = theme.ui.bg_tabline },
+		BufferlineSeparator = { fg = theme.ui.bg_tabline, bg = theme.ui.bg_tabline },
+		BufferlineSeparatorSelected = { fg = theme.ui.bg_tabline, bg = theme.ui.bg_tabline },
 
 		-- Nvim-Navic
 		NavicIconsFile = { link = "Directory" },

diff --git a/lua/kanagawa-paper/themes.lua b/lua/kanagawa-paper/themes.lua
@@ -60,11 +60,12 @@
 ---@field bg_p1 ColorSpec Lighter background ColorColumn, Folded, Gutter
 ---@field bg_p2 ColorSpec Lighter background Cursor{Line,Column}, TabLineSel (Selected Items)
 ---@field bg_gutter ColorSpec {Sign,Fold}Column, LineNr
+---@field bg_search ColorSpec
+---@field bg_visual ColorSpec
+---@field bg_tabline ColorSpec
 ---@field special ColorSpec SpecialKey
 ---@field nontext ColorSpec LineNr, NonText
 ---@field whitespace ColorSpec Whitespace
----@field bg_search ColorSpec
----@field bg_visual ColorSpec
 ---@field win_separator ColorSpec
 ---@field indent ColorSpec
 ---@field pmenu MenuElements
@@ -123,6 +124,7 @@ return function(palette)
 			bg_gutter = gutter_bg,
 			bg_search = palette.springViolet1,
 			bg_visual = palette.sumiInk5,
+			bg_tabline = palette.sumiInk0,
 
 			special = palette.springViolet1,
 			nontext = palette.sumiInk6,