mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
patch 8.1.1814: a long title in a popup window overflows
Problem: A long title in a popup window overflows. Solution: Truncate the title. (closes #4770)
This commit is contained in:
@@ -2969,8 +2969,14 @@ update_popups(void (*win_update)(win_T *wp))
|
|||||||
|
|
||||||
// Title goes on top of border or padding.
|
// Title goes on top of border or padding.
|
||||||
if (wp->w_popup_title != NULL)
|
if (wp->w_popup_title != NULL)
|
||||||
screen_puts(wp->w_popup_title, wp->w_winrow, wp->w_wincol + 1,
|
{
|
||||||
|
int len = (int)STRLEN(wp->w_popup_title) + 1;
|
||||||
|
char_u *title = alloc(len);
|
||||||
|
|
||||||
|
trunc_string(wp->w_popup_title, title, total_width - 2, len);
|
||||||
|
screen_puts(title, wp->w_winrow, wp->w_wincol + 1,
|
||||||
wp->w_popup_border[0] > 0 ? border_attr[0] : popup_attr);
|
wp->w_popup_border[0] > 0 ? border_attr[0] : popup_attr);
|
||||||
|
}
|
||||||
|
|
||||||
// Compute scrollbar thumb position and size.
|
// Compute scrollbar thumb position and size.
|
||||||
if (wp->w_has_scrollbar)
|
if (wp->w_has_scrollbar)
|
||||||
|
10
src/testdir/dumps/Test_popupwin_longtitle_1.dump
Normal file
10
src/testdir/dumps/Test_popupwin_longtitle_1.dump
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
>1+0&#ffffff0| @73
|
||||||
|
|2| @73
|
||||||
|
|3| @73
|
||||||
|
|4| @25| +0#0000001#ffd7ff255|a| |v|e|r|y| |.@2|g| |t|o| |f|i|t| | +0#0000000#ffffff0@27
|
||||||
|
|5| @25|o+0#0000001#ffd7ff255|n|e| @16| +0#0000000#ffffff0@27
|
||||||
|
|6| @25|t+0#0000001#ffd7ff255|w|o| @16| +0#0000000#ffffff0@27
|
||||||
|
|7| @25|a+0#0000001#ffd7ff255|n|o|t|h|e|r| @12| +0#0000000#ffffff0@27
|
||||||
|
|8| @73
|
||||||
|
|9| @73
|
||||||
|
|:| @55|1|,|1| @10|T|o|p|
|
10
src/testdir/dumps/Test_popupwin_longtitle_2.dump
Normal file
10
src/testdir/dumps/Test_popupwin_longtitle_2.dump
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
>1+0&#ffffff0| @73
|
||||||
|
|2| @73
|
||||||
|
|3| @24|╔+0#0000001#ffd7ff255|a| |v|e|r|y| |l|.@2|n|g| |t|o| |f|i|t|╗| +0#0000000#ffffff0@26
|
||||||
|
|4| @24|║+0#0000001#ffd7ff255|o|n|e| @16|║| +0#0000000#ffffff0@26
|
||||||
|
|5| @24|║+0#0000001#ffd7ff255|t|w|o| @16|║| +0#0000000#ffffff0@26
|
||||||
|
|6| @24|║+0#0000001#ffd7ff255|a|n|o|t|h|e|r| @12|║| +0#0000000#ffffff0@26
|
||||||
|
|7| @24|╚+0#0000001#ffd7ff255|═@19|╝| +0#0000000#ffffff0@26
|
||||||
|
|8| @73
|
||||||
|
|9| @73
|
||||||
|
|:| @55|1|,|1| @10|T|o|p|
|
@@ -1282,12 +1282,20 @@ func Test_popup_title()
|
|||||||
" put the title on.
|
" put the title on.
|
||||||
let lines =<< trim END
|
let lines =<< trim END
|
||||||
call setline(1, range(1, 20))
|
call setline(1, range(1, 20))
|
||||||
call popup_create(['one', 'two', 'another'], #{title: 'Title String'})
|
let winid = popup_create(['one', 'two', 'another'], #{title: 'Title String'})
|
||||||
END
|
END
|
||||||
call writefile(lines, 'XtestPopupTitle')
|
call writefile(lines, 'XtestPopupTitle')
|
||||||
let buf = RunVimInTerminal('-S XtestPopupTitle', #{rows: 10})
|
let buf = RunVimInTerminal('-S XtestPopupTitle', #{rows: 10})
|
||||||
call VerifyScreenDump(buf, 'Test_popupwin_title', {})
|
call VerifyScreenDump(buf, 'Test_popupwin_title', {})
|
||||||
|
|
||||||
|
call term_sendkeys(buf, ":call popup_setoptions(winid, #{maxwidth: 20, title: 'a very long title that is not going to fit'})\<CR>")
|
||||||
|
call term_sendkeys(buf, ":\<CR>")
|
||||||
|
call VerifyScreenDump(buf, 'Test_popupwin_longtitle_1', {})
|
||||||
|
|
||||||
|
call term_sendkeys(buf, ":call popup_setoptions(winid, #{border: []})\<CR>")
|
||||||
|
call term_sendkeys(buf, ":\<CR>")
|
||||||
|
call VerifyScreenDump(buf, 'Test_popupwin_longtitle_2', {})
|
||||||
|
|
||||||
" clean up
|
" clean up
|
||||||
call StopVimInTerminal(buf)
|
call StopVimInTerminal(buf)
|
||||||
call delete('XtestPopupTitle')
|
call delete('XtestPopupTitle')
|
||||||
|
@@ -773,6 +773,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 */
|
||||||
|
/**/
|
||||||
|
1814,
|
||||||
/**/
|
/**/
|
||||||
1813,
|
1813,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user