Skip to content

feat: add overlap option and support negative render_offset_top #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
charlesg3 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add overlap option and support negative render_offset_top #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions lua/image/image.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ function Image:render(geometry)

-- create extmark
if was_rendered then
local total_height = height + (self.render_offset_top or 0)
-- subtract overlap lines to allow the rendered image to overlap with them
local total_height = math.max(0, height + (self.render_offset_top or 0) - (self.overlap or 0) + 1)
local has_up_to_date_extmark = previous_extmark and previous_extmark.height == total_height

if not has_up_to_date_extmark then
Expand All @@ -121,8 +122,7 @@ function Image:render(geometry)
local filler = {}
local extmark_opts = { id = self.internal_id, strict = false }
if self.with_virtual_padding then
-- only reserve real height for the extmark, padding is applied during rendering
local total_lines = height
local total_lines = math.max(0, height + (self.render_offset_top or 0) - (self.overlap or 0) + 1)
for _ = 0, total_lines - 1 do
filler[#filler + 1] = { { " ", "" } }
end
Expand Down Expand Up @@ -298,6 +298,7 @@ local from_file = function(path, options, state)
inline = opts.inline or opts.with_virtual_padding or false,
is_rendered = false,
render_offset_top = opts.render_offset_top or 0,
overlap = opts.overlap or 0,
crop_hash = nil,
resize_hash = nil,
namespace = opts.namespace or nil,
Expand Down Expand Up @@ -357,6 +358,7 @@ local from_file = function(path, options, state)
inline = opts.inline or opts.with_virtual_padding or false,
is_rendered = false,
render_offset_top = opts.render_offset_top or 0,
overlap = opts.overlap or 0,
crop_hash = nil,
resize_hash = nil,
namespace = opts.namespace or nil,
Expand Down
12 changes: 4 additions & 8 deletions lua/image/renderer.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,7 @@ local render = function(image)
if image.window == nil then
absolute_x = original_x
absolute_y = original_y
-- apply render_offset_top
if image.render_offset_top and image.render_offset_top > 0 then
--
absolute_y = absolute_y + image.render_offset_top
end
absolute_y = absolute_y + (image.render_offset_top or 0)
else
-- get window object
local window = nil
Expand Down Expand Up @@ -317,10 +313,10 @@ local render = function(image)
absolute_x = screen_pos.col - 1
absolute_y = screen_pos.row
end
-- apply render_offset_top offset if set (but not for floating windows and not during partial scroll)
-- apply render_offset_top except for floating windows or during partial scroll
local is_floating = window and window.is_floating or false
if image.render_offset_top and image.render_offset_top > 0 and not is_floating and not is_partial_scroll then
absolute_y = absolute_y + image.render_offset_top
if not is_floating and not is_partial_scroll then
absolute_y = absolute_y + (image.render_offset_top or 0)
end
end

Expand Down