From e90f0ee657021c29c91f560c92d6aaef4da5fa21 Mon Sep 17 00:00:00 2001 From: Dheepak Krishnamurthy Date: Sat, 20 May 2023 17:30:30 -0400 Subject: [PATCH] =?UTF-8?q?feat:=20Change=20option=20to=20lazygit=5Ffloati?= =?UTF-8?q?ng=5Fwindow=5Fborder=5Fchars=20=E2=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- lua/lazygit/window.lua | 2 +- plugin/lazygit.vim | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 4a47657..4b73962 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ The following are configuration options and their defaults. ```vim let g:lazygit_floating_window_winblend = 0 " transparency of floating window let g:lazygit_floating_window_scaling_factor = 0.9 " scaling factor for floating window -let g:lazygit_floating_window_chars = ['╭','─', '╮', '│', '╯','─', '╰', '│'] " customize lazygit popup window corner characters +let g:lazygit_floating_window_border_chars = ['╭','─', '╮', '│', '╯','─', '╰', '│'] " customize lazygit popup window corner characters let g:lazygit_floating_window_use_plenary = 0 " use plenary.nvim to manage floating window if available let g:lazygit_use_neovim_remote = 1 " fallback to 0 if neovim-remote is not installed @@ -71,7 +71,7 @@ let g:lazygit_config_file_path = '' " custom config file path ```lua vim.g.lazygit_floating_window_winblend = 0 -- transparency of floating window vim.g.lazygit_floating_window_scaling_factor = 0.9 -- scaling factor for floating window -vim.g.lazygit_floating_window_chars = ['╭','─', '╮', '│', '╯','─', '╰', '│'] -- customize lazygit popup window corner characters +vim.g.lazygit_floating_window_border_chars = ['╭','─', '╮', '│', '╯','─', '╰', '│'] -- customize lazygit popup window corner characters vim.g.lazygit_floating_window_use_plenary = 0 -- use plenary.nvim to manage floating window if available vim.g.lazygit_use_neovim_remote = 1 -- fallback to 0 if neovim-remote is not installed diff --git a/lua/lazygit/window.lua b/lua/lazygit/window.lua index 56655d3..ff33200 100644 --- a/lua/lazygit/window.lua +++ b/lua/lazygit/window.lua @@ -34,7 +34,7 @@ local function open_floating_window() local opts = { style = 'minimal', relative = 'editor', row = row, col = col, width = width, height = height } local topleft, top, topright, right, botright, bot, botleft, left - local window_chars = vim.g.lazygit_floating_window_chars + local window_chars = vim.g.lazygit_floating_window_border_chars if type(window_chars) == 'table' and #window_chars == 8 then topleft, top, topright, right, botright, bot, botleft, left = unpack(window_chars) else diff --git a/plugin/lazygit.vim b/plugin/lazygit.vim index 6dce40d..44c93be 100644 --- a/plugin/lazygit.vim +++ b/plugin/lazygit.vim @@ -21,15 +21,15 @@ endif if exists('g:lazygit_floating_window_corner_chars') echohl WarningMsg - echomsg "`g:lazygit_floating_window_corner_chars` is deprecated. Please use `g:lazygit_floating_window_chars` instead." + echomsg "`g:lazygit_floating_window_corner_chars` is deprecated. Please use `g:lazygit_floating_window_border_chars` instead." echohl None - if !exists('g:lazygit_floating_window_chars') - let g:lazygit_floating_window_chars = g:lazygit_floating_window_corner_chars + if !exists('g:lazygit_floating_window_border_chars') + let g:lazygit_floating_window_border_chars = g:lazygit_floating_window_corner_chars endif endif -if !exists('g:lazygit_floating_window_chars') - let g:lazygit_floating_window_chars = ['╭','─', '╮', '│', '╯','─', '╰', '│'] +if !exists('g:lazygit_floating_window_border_chars') + let g:lazygit_floating_window_border_chars = ['╭','─', '╮', '│', '╯','─', '╰', '│'] endif " if lazygit_use_custom_config_file_path is set to 1 the