mirror of
https://github.com/vim/vim.git
synced 2025-09-30 04:44:14 -04:00
patch 8.1.2399: info popup on top of cursor if it doesn't fit
Problem: Info popup on top of cursor if it doesn't fit. Solution: Hide the popup if it doesn't fit.
This commit is contained in:
@@ -661,6 +661,12 @@ pum_position_info_popup(win_T *wp)
|
|||||||
// align with the selected item
|
// align with the selected item
|
||||||
row += pum_selected - pum_first + 1;
|
row += pum_selected - pum_first + 1;
|
||||||
|
|
||||||
|
wp->w_popup_flags &= ~POPF_HIDDEN;
|
||||||
|
if (wp->w_maxwidth < 10)
|
||||||
|
// The popup is not going to fit or will overlap with the cursor
|
||||||
|
// position, hide the popup.
|
||||||
|
wp->w_popup_flags |= POPF_HIDDEN;
|
||||||
|
else
|
||||||
popup_set_wantpos_rowcol(wp, row, col);
|
popup_set_wantpos_rowcol(wp, row, col);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
8
src/testdir/dumps/Test_popupwin_infopopup_wide_1.dump
Normal file
8
src/testdir/dumps/Test_popupwin_infopopup_wide_1.dump
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
|s+0&#ffffff0|c|r|a|p> @69
|
||||||
|
|s+0#0000001#e0e0e08|c|r|a|p| @5|s|o|m|e| |l|o|n|g| |t|e|x|t| |t|o| |m|a|k|e| |s|u|r|e| |t|h|e| |m|e|n|u| |t|a|k|e|s| |u|p| |a|l@1| |o|f| |t|h|e| |w|i|d|t|h| |o
|
||||||
|
|s+0&#ffd7ff255|c|a|p@1|i|e|r| @2|s|o|m|e| |l|o|n|g| |t|e|x|t| |t|o| |m|a|k|e| |s|u|r|e| |t|h|e| |m|e|n|u| |t|a|k|e|s| |u|p| |a|l@1| |o|f| |t|h|e| |w|i|d|t|h| |o
|
||||||
|
|s|c|r|a|p@1|i|e|r|2| |s|o|m|e| |l|o|n|g| |t|e|x|t| |t|o| |m|a|k|e| |s|u|r|e| |t|h|e| |m|e|n|u| |t|a|k|e|s| |u|p| |a|l@1| |o|f| |t|h|e| |w|i|d|t|h| |o
|
||||||
|
|4+0#0000000#ffffff0| @73
|
||||||
|
|5| @73
|
||||||
|
|6| @73
|
||||||
|
|-+2&&@1| |O|m|n|i| |c|o|m|p|l|e|t|i|o|n| |(|^|O|^|N|^|P|)| |m+0#00e0003&|a|t|c|h| |1| |o|f| |3| +0#0000000&@34
|
@@ -2982,6 +2982,58 @@ func Test_popupmenu_info_hidden()
|
|||||||
call delete('XtestInfoPopupHidden')
|
call delete('XtestInfoPopupHidden')
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_popupmenu_info_too_wide()
|
||||||
|
CheckScreendump
|
||||||
|
CheckFeature quickfix
|
||||||
|
|
||||||
|
let lines =<< trim END
|
||||||
|
call setline(1, range(10))
|
||||||
|
|
||||||
|
set completeopt+=preview,popup
|
||||||
|
set completepopup=align:menu
|
||||||
|
set omnifunc=OmniFunc
|
||||||
|
hi InfoPopup ctermbg=lightgrey
|
||||||
|
|
||||||
|
func OmniFunc(findstart, base)
|
||||||
|
if a:findstart
|
||||||
|
return 0
|
||||||
|
endif
|
||||||
|
|
||||||
|
let menuText = 'some long text to make sure the menu takes up all of the width of the window'
|
||||||
|
return #{
|
||||||
|
\ words: [
|
||||||
|
\ #{
|
||||||
|
\ word: 'scrap',
|
||||||
|
\ menu: menuText,
|
||||||
|
\ info: "other words are\ncooler than this and some more text\nto make wrap",
|
||||||
|
\ },
|
||||||
|
\ #{
|
||||||
|
\ word: 'scappier',
|
||||||
|
\ menu: menuText,
|
||||||
|
\ info: 'words are cool',
|
||||||
|
\ },
|
||||||
|
\ #{
|
||||||
|
\ word: 'scrappier2',
|
||||||
|
\ menu: menuText,
|
||||||
|
\ info: 'words are cool',
|
||||||
|
\ },
|
||||||
|
\ ]
|
||||||
|
\ }
|
||||||
|
endfunc
|
||||||
|
END
|
||||||
|
|
||||||
|
call writefile(lines, 'XtestInfoPopupWide')
|
||||||
|
let buf = RunVimInTerminal('-S XtestInfoPopupWide', #{rows: 8})
|
||||||
|
call term_wait(buf, 50)
|
||||||
|
|
||||||
|
call term_sendkeys(buf, "Ascr\<C-X>\<C-O>")
|
||||||
|
call VerifyScreenDump(buf, 'Test_popupwin_infopopup_wide_1', {})
|
||||||
|
|
||||||
|
call term_sendkeys(buf, "\<Esc>")
|
||||||
|
call StopVimInTerminal(buf)
|
||||||
|
call delete('XtestInfoPopupWide')
|
||||||
|
endfunc
|
||||||
|
|
||||||
func Test_popupwin_recycle_bnr()
|
func Test_popupwin_recycle_bnr()
|
||||||
let bufnr = popup_notification('nothing wrong', {})->winbufnr()
|
let bufnr = popup_notification('nothing wrong', {})->winbufnr()
|
||||||
call popup_clear()
|
call popup_clear()
|
||||||
|
@@ -742,6 +742,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
2399,
|
||||||
/**/
|
/**/
|
||||||
2398,
|
2398,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user