refactor(configs): check actual background instead of opt val

Bekaboo · Dec 8, 2023 · 5139874 · 5139874
1 parent e68e054
commit 5139874
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -522,13 +522,13 @@ https://github.com/Bekaboo/dropbar.nvim/assets/76579810/e8c1ac26-0321-4762-9975-
         ---@param menu dropbar_menu_t
         col = function(menu)
           if menu.prev_menu then
-            local offset = 0
-            if
-              menu.prev_menu.scrollbar and M.opts.menu.scrollbar.background
-            then
-              offset = 1
-            end
-            return menu.prev_menu._win_configs.width + offset
+            return menu.prev_menu._win_configs.width
+              + (
+                menu.prev_menu.scrollbar
+                  and menu.prev_menu.scrollbar.background
+                  and 1
+                or 0
+              )
           end
           local mouse = vim.fn.getmousepos()
           local bar = utils.bar.get({ win = menu.prev_win })

diff --git a/lua/dropbar/configs.lua b/lua/dropbar/configs.lua
@@ -288,11 +288,13 @@ M.opts = {
       ---@param menu dropbar_menu_t
       col = function(menu)
         if menu.prev_menu then
-          local offset = 0
-          if menu.prev_menu.scrollbar and M.opts.menu.scrollbar.background then
-            offset = 1
-          end
-          return menu.prev_menu._win_configs.width + offset
+          return menu.prev_menu._win_configs.width
+            + (
+              menu.prev_menu.scrollbar
+                and menu.prev_menu.scrollbar.background
+                and 1
+              or 0
+            )
         end
         local mouse = vim.fn.getmousepos()
         local bar = utils.bar.get({ win = menu.prev_win })