From dae7fe9034ce85edfed7567f7fbd4ed93a73fd96 Mon Sep 17 00:00:00 2001 From: max397574 Date: Mon, 22 Nov 2021 12:42:06 +0100 Subject: =?UTF-8?q?feat():=20=E2=9C=A8default=20value=20for=20margin=20and?= =?UTF-8?q?=20cursor=20column?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/startup/init.lua | 7 ++++--- lua/startup/utils.lua | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'lua') diff --git a/lua/startup/init.lua b/lua/startup/init.lua index 4dbd3b2..2949dcf 100644 --- a/lua/startup/init.lua +++ b/lua/startup/init.lua @@ -141,10 +141,11 @@ end ---@return table aligned the aligned strings function startup.align(dict, alignment) local margin_calculated = 0 - if settings[current_section].margin < 1 then - margin_calculated = vim.o.columns * settings[current_section].margin + local margin = settings.margin and type(settings.margin) == "number" or 5 + if margin < 1 then + margin_calculated = vim.o.columns * margin else - margin_calculated = settings[current_section].margin + margin_calculated = margin end local aligned = {} local max_len = utils.longest_line(dict) diff --git a/lua/startup/utils.lua b/lua/startup/utils.lua index 1f4fa21..c80bcfa 100644 --- a/lua/startup/utils.lua +++ b/lua/startup/utils.lua @@ -178,10 +178,11 @@ end local column = function() local settings = require("startup").settings local column_calc - if settings.options.cursor_column < 1 then - column_calc = math.floor(vim.o.columns * settings.options.cursor_column) + local cursor_column = settings.options.cursor_column or 0.5 + if cursor_column < 1 then + column_calc = math.floor(vim.o.columns * cursor_column) else - column_calc = settings.options.cursor_column + column_calc = cursor_column end return column_calc end -- cgit v1.2.3