Skip to content
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

feat: implement posinvert #16

Merged
merged 3 commits into from
Aug 9, 2021
Merged

feat: implement posinvert #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21e135d
feat: implement `posinvert`
l-kershaw Aug 2, 2021
043847c
fix: tweak nvim's `anchor` setting
l-kershaw Aug 2, 2021
babaa4a
docs: update readme
l-kershaw Aug 3, 2021
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ Suported Features:
- [x] padding
- [?] pos
- Somewhat implemented. Doesn't work with borders though.
- [x] posinvert
- [x] time
- [x] title
- [x] wrap
Expand All @@ -87,7 +88,6 @@ Suported Features:
- firstline
- hidden
- ~ pos
- posinvert
- fixed
- filter
- filtermode
Expand Down
32 changes: 22 additions & 10 deletions lua/popup/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,8 @@ function popup.create(what, vim_options)
else
win_opts.anchor = popup._pos_map[vim_options.pos]
end
end

-- posinvert, When FALSE the value of "pos" is always used. When
-- , TRUE (the default) and the popup does not fit
-- , vertically and there is more space on the other side
-- , then the popup is placed on the other side of the
-- , position indicated by "line".
if dict_default(vim_options, 'posinvert', option_defaults) then
-- TODO: handle the invert thing
else
win_opts.anchor = "NW" -- This is the default, but makes `posinvert` easier to implement
end

-- , fixed When FALSE (the default), and:
Expand All @@ -157,7 +150,7 @@ function popup.create(what, vim_options)

win_opts.style = 'minimal'

-- Feels like maxheigh, minheight, maxwidth, minwidth will all be related
-- Feels like maxheight, minheight, maxwidth, minwidth will all be related
--
-- maxheight Maximum height of the contents, excluding border and padding.
-- minheight Minimum height of the contents, excluding border and padding.
Expand All @@ -176,6 +169,25 @@ function popup.create(what, vim_options)
win_opts.width = utils.bounded(width, vim_options.minwidth, vim_options.maxwidth)
win_opts.height = utils.bounded(height, vim_options.minheight, vim_options.maxheight)

-- posinvert, When FALSE the value of "pos" is always used. When
-- , TRUE (the default) and the popup does not fit
-- , vertically and there is more space on the other side
-- , then the popup is placed on the other side of the
-- , position indicated by "line".
if dict_default(vim_options, 'posinvert', option_defaults) then
if win_opts.anchor == "NW" or win_opts.anchor == "NE" then
if win_opts.row + win_opts.height > vim.o.lines and win_opts.row * 2 > vim.o.lines then
-- Don't know why, but this is how vim adjusts it
win_opts.row = win_opts.row - win_opts.height - 2
end
elseif win_opts.anchor == "SW" or win_opts.anchor == "SE" then
if win_opts.row - win_opts.height < 0 and win_opts.row * 2 < vim.o.lines then
-- Don't know why, but this is how vim adjusts it
win_opts.row = win_opts.row + win_opts.height + 2
end
end
end

-- textprop, When present the popup is positioned next to a text
-- , property with this name and will move when the text
-- , property moves. Use an empty string to remove. See
Expand Down