From 4f35f77b82e2973b22c2884a95dcb934927e9b7e Mon Sep 17 00:00:00 2001 From: lpnh Date: Tue, 25 Jun 2024 13:45:07 -0300 Subject: [PATCH 1/5] fix(full-border): address max-preview compatibility --- full-border.yazi/init.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/full-border.yazi/init.lua b/full-border.yazi/init.lua index e79bfe3..a274f59 100644 --- a/full-border.yazi/init.lua +++ b/full-border.yazi/init.lua @@ -4,6 +4,13 @@ local function setup() local bar = function(c, x, y) x, y = math.max(0, x), math.max(0, y) + + if x == 0 and y == 1 then + c = "╭" + elseif x == 0 and y == 50 then + c = "╰" + end + return ui.Bar(ui.Rect { x = x, y = y, w = ya.clamp(0, area.w - x, 1), h = math.min(1, area.h) }, ui.Bar.TOP) :symbol(c) end From dc7044c7480fb4a96f7dac2c633015743fe6ed6d Mon Sep 17 00:00:00 2001 From: lpnh Date: Wed, 26 Jun 2024 09:43:26 -0300 Subject: [PATCH 2/5] fix(full-border): address hide-preview compatibility --- full-border.yazi/init.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/full-border.yazi/init.lua b/full-border.yazi/init.lua index a274f59..42535b9 100644 --- a/full-border.yazi/init.lua +++ b/full-border.yazi/init.lua @@ -15,6 +15,14 @@ local function setup() :symbol(c) end + local dynamic_padding = function() + if chunks[3].w == 0 then + return ui.Padding(0, 1, 1, 1) + end + + return ui.Padding.y(1) + end + return ya.flat { -- Borders ui.Border(area, ui.Border.ALL):type(ui.Border.ROUNDED), @@ -29,7 +37,7 @@ local function setup() -- Parent Parent:render(chunks[1]:padding(ui.Padding.xy(1))), -- Current - Current:render(chunks[2]:padding(ui.Padding.y(1))), + Current:render(chunks[2]:padding(dynamic_padding())), -- Preview Preview:render(chunks[3]:padding(ui.Padding.xy(1))), } From 67d6e0f1b1fee664f24cf198f8cf2e7e6211be6e Mon Sep 17 00:00:00 2001 From: lpnh Date: Wed, 26 Jun 2024 11:30:17 -0300 Subject: [PATCH 3/5] feat: make solution more robust --- full-border.yazi/init.lua | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/full-border.yazi/init.lua b/full-border.yazi/init.lua index 42535b9..86a1a75 100644 --- a/full-border.yazi/init.lua +++ b/full-border.yazi/init.lua @@ -2,13 +2,19 @@ local function setup() Manager.render = function(self, area) local chunks = self:layout(area) + local dynamic_first_bar = function() + if chunks[2].w == 0 then + return + end + + return ui.Bar(chunks[1], ui.Bar.RIGHT) + end + local bar = function(c, x, y) x, y = math.max(0, x), math.max(0, y) - if x == 0 and y == 1 then - c = "╭" - elseif x == 0 and y == 50 then - c = "╰" + if chunks[1].w == 0 and x == 0 then + return ui.Bar(ui.Rect { x = x, y = y, w = ya.clamp(0, area.w - x, 1), h = math.min(1, area.h) }, ui.Bar.NONE) end return ui.Bar(ui.Rect { x = x, y = y, w = ya.clamp(0, area.w - x, 1), h = math.min(1, area.h) }, ui.Bar.TOP) @@ -16,7 +22,9 @@ local function setup() end local dynamic_padding = function() - if chunks[3].w == 0 then + if chunks[1].w == 0 then + return ui.Padding(1, 0, 1, 1) + elseif chunks[3].w == 0 then return ui.Padding(0, 1, 1, 1) end @@ -26,7 +34,7 @@ local function setup() return ya.flat { -- Borders ui.Border(area, ui.Border.ALL):type(ui.Border.ROUNDED), - ui.Bar(chunks[1], ui.Bar.RIGHT), + dynamic_first_bar(), ui.Bar(chunks[3], ui.Bar.LEFT), bar("┬", chunks[1].right - 1, chunks[1].y), From 2293cf5d5b0b8a6182151e84e8dc4bb4f17080b2 Mon Sep 17 00:00:00 2001 From: lpnh Date: Wed, 26 Jun 2024 16:09:24 -0300 Subject: [PATCH 4/5] refactor: improve readability --- full-border.yazi/init.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/full-border.yazi/init.lua b/full-border.yazi/init.lua index 86a1a75..7134bcc 100644 --- a/full-border.yazi/init.lua +++ b/full-border.yazi/init.lua @@ -13,12 +13,10 @@ local function setup() local bar = function(c, x, y) x, y = math.max(0, x), math.max(0, y) - if chunks[1].w == 0 and x == 0 then - return ui.Bar(ui.Rect { x = x, y = y, w = ya.clamp(0, area.w - x, 1), h = math.min(1, area.h) }, ui.Bar.NONE) - end - - return ui.Bar(ui.Rect { x = x, y = y, w = ya.clamp(0, area.w - x, 1), h = math.min(1, area.h) }, ui.Bar.TOP) - :symbol(c) + return ui.Bar( + ui.Rect { x = x, y = y, w = ya.clamp(0, area.w - x, 1), h = math.min(1, area.h) }, + x == 0 and ui.Bar.NONE or ui.Bar.TOP + ):symbol(c) end local dynamic_padding = function() From 3df0cf589281194583b2916b0170be400eefb490 Mon Sep 17 00:00:00 2001 From: sxyazi Date: Thu, 27 Jun 2024 22:35:35 +0800 Subject: [PATCH 5/5] Simplify the code --- full-border.yazi/init.lua | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/full-border.yazi/init.lua b/full-border.yazi/init.lua index 7134bcc..dcfa902 100644 --- a/full-border.yazi/init.lua +++ b/full-border.yazi/init.lua @@ -2,38 +2,22 @@ local function setup() Manager.render = function(self, area) local chunks = self:layout(area) - local dynamic_first_bar = function() - if chunks[2].w == 0 then - return - end - - return ui.Bar(chunks[1], ui.Bar.RIGHT) - end - local bar = function(c, x, y) - x, y = math.max(0, x), math.max(0, y) + if x <= 0 or x == area.w - 1 then + return {} + end return ui.Bar( - ui.Rect { x = x, y = y, w = ya.clamp(0, area.w - x, 1), h = math.min(1, area.h) }, - x == 0 and ui.Bar.NONE or ui.Bar.TOP + ui.Rect { x = x, y = math.max(0, y), w = ya.clamp(0, area.w - x, 1), h = math.min(1, area.h) }, + ui.Bar.TOP ):symbol(c) end - local dynamic_padding = function() - if chunks[1].w == 0 then - return ui.Padding(1, 0, 1, 1) - elseif chunks[3].w == 0 then - return ui.Padding(0, 1, 1, 1) - end - - return ui.Padding.y(1) - end - return ya.flat { -- Borders ui.Border(area, ui.Border.ALL):type(ui.Border.ROUNDED), - dynamic_first_bar(), - ui.Bar(chunks[3], ui.Bar.LEFT), + ui.Bar(chunks[1]:padding(ui.Padding.y(1)), ui.Bar.RIGHT), + ui.Bar(chunks[3]:padding(ui.Padding.y(1)), ui.Bar.LEFT), bar("┬", chunks[1].right - 1, chunks[1].y), bar("┴", chunks[1].right - 1, chunks[1].bottom - 1), @@ -43,7 +27,7 @@ local function setup() -- Parent Parent:render(chunks[1]:padding(ui.Padding.xy(1))), -- Current - Current:render(chunks[2]:padding(dynamic_padding())), + Current:render(chunks[2]:padding(ui.Padding.y(1))), -- Preview Preview:render(chunks[3]:padding(ui.Padding.xy(1))), }