From e37b3ac92944d2562827b457c81994384c4ba274 Mon Sep 17 00:00:00 2001 From: Shadman Date: Fri, 5 Feb 2021 18:29:34 +0600 Subject: [PATCH] Fix #33 (#79) --- lua/lualine.lua | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/lua/lualine.lua b/lua/lualine.lua index 3c13c79..3547564 100644 --- a/lua/lualine.lua +++ b/lua/lualine.lua @@ -65,14 +65,7 @@ local function set_lualine_theme() theme_set = M.theme end -local function statusline(is_focused) - local sections = M.sections - if not is_focused then - sections = M.inactive_sections - end - if M.theme ~= theme_set then - set_lualine_theme() - end +local function statusline(sections, is_focused) local status = {} if sections.lualine_a then table.insert(status, highlight.format_highlight(is_focused, 'lualine_a')) @@ -102,18 +95,19 @@ local function statusline(is_focused) return table.concat(status) end -function M.set_inactive_statusline() - vim.wo.statusline = statusline() +local function status_dispatch() + if vim.g.statusline_winid == vim.fn.win_getid() then + return statusline(M.sections, true) + else + return statusline(M.inactive_sections, false) + end end local function exec_autocommands() _G.set_lualine_theme = set_lualine_theme - _G.set_active_statusline = statusline vim.api.nvim_exec([[ augroup lualine autocmd! - autocmd WinEnter,BufEnter * setlocal statusline=%!v:lua.set_active_statusline(1) - autocmd WinLeave,BufLeave * lua require('lualine').set_inactive_statusline() autocmd ColorScheme * call v:lua.set_lualine_theme() augroup END ]], false) @@ -124,6 +118,8 @@ function M.status() load_extensions() set_lualine_theme() exec_autocommands() + _G.lualine_statusline = status_dispatch + vim.o.statusline = '%!v:lua.lualine_statusline()' end return M