fix: use correct maximum width for global statusline (#237)

freddiehaddad · Mar 18, 2022 · 293a3de · 293a3de
1 parent 2b6ff21
commit 293a3de
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/lua/feline/generator.lua b/lua/feline/generator.lua
@@ -1,5 +1,6 @@
 local bo = vim.bo
 local api = vim.api
+local opt = vim.opt
 
 local feline = require('feline')
 local utils = require('feline.utils')
@@ -545,10 +546,18 @@ function M.generate_statusline(is_active)
         end
     end
 
-    local window_width = api.nvim_win_get_width(0)
+    local maxwidth
 
-    -- If statusline width is greater than the window width, begin the truncation process
-    if statusline_width > window_width then
+    -- If statusline is global, use entire Neovim window width for maxwidth
+    -- Otherwise just use width of current window
+    if opt.laststatus:get() == 3 then
+        maxwidth = opt.columns:get()
+    else
+        maxwidth = api.nvim_win_get_width(0)
+    end
+
+    -- If statusline width is greater than maxwidth, begin the truncation process
+    if statusline_width > maxwidth then
         -- First, sort the component indices in ascending order of the priority of the components
         -- that the indices refer to
         table.sort(component_indices, function(first, second)
@@ -594,15 +603,15 @@ function M.generate_statusline(is_active)
                 end
             end
 
-            if statusline_width <= window_width then
+            if statusline_width <= maxwidth then
                 break
             end
         end
     end
 
     -- If statusline still doesn't fit within window, remove components with truncate_hide set to
     -- true until it does
-    if statusline_width > window_width then
+    if statusline_width > maxwidth then
         for _, indices in ipairs(component_indices) do
             local section, number = indices[1], indices[2]
             local component = sections[section][number]
@@ -618,7 +627,7 @@ function M.generate_statusline(is_active)
                 end
             end
 
-            if statusline_width <= window_width then
+            if statusline_width <= maxwidth then
                 break
             end
         end