Mercurial > vim
changeset 25535:7cb1597067e0 v8.2.3304
patch 8.2.3304: popup window title with wide characters is truncated
Commit: https://github.com/vim/vim/commit/c611941c606328740b6e9acc1191a5d97ace13e2
Author: rbtnn <naru123456789@gmail.com>
Date: Sat Aug 7 13:08:45 2021 +0200
patch 8.2.3304: popup window title with wide characters is truncated
Problem: Popup window title with wide characters is truncated.
Solution: Use vim_strsize() instead of MB_CHARLEN(). (Naruhiko Nishino,
closes #8721)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 07 Aug 2021 13:15:03 +0200 |
| parents | 1b239f0231d3 |
| children | 6ce4df29d7c8 |
| files | src/popupwin.c src/testdir/dumps/Test_popupwin_multibytetitle.dump src/testdir/test_popupwin.vim src/version.c |
| diffstat | 4 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/popupwin.c +++ b/src/popupwin.c @@ -3896,7 +3896,7 @@ update_popups(void (*win_update)(win_T * title_wincol = wp->w_wincol + 1; if (wp->w_popup_title != NULL) { - title_len = (int)MB_CHARLEN(wp->w_popup_title); + title_len = vim_strsize(wp->w_popup_title); // truncate the title if too long if (title_len > total_width - 2)
--- a/src/testdir/dumps/Test_popupwin_multibytetitle.dump +++ b/src/testdir/dumps/Test_popupwin_multibytetitle.dump @@ -1,7 +1,7 @@ >1+0&#ffffff0| @73 |2| @73 |3| @73 -|4| @25|╔+0#0000001#ffd7ff255|▶|Ä|Ö|Ü|◀|═@12|╗| +0#0000000#ffffff0@27 +|4| @25|╔+0#0000001#ffd7ff255|▶|Ä|あ*&|い|う|え|お|◀+&|═@4|╗| +0#0000000#ffffff0@27 |5| @25|║+0#0000001#ffd7ff255| |T+0&#e0e0e08|h|i|s| |i|s| |a| |l|i|n|e| @1| +0&#ffd7ff255|║| +0#0000000#ffffff0@27 |6| @25|║+0#0000001#ffd7ff255| |a|n|d| |a|n|o|t|h|e|r| |l|i|n|e| |║| +0#0000000#ffffff0@27 |7| @25|╚+0#0000001#ffd7ff255|═@17|╝| +0#0000000#ffffff0@27
--- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -1817,7 +1817,7 @@ func Test_popup_title() call VerifyScreenDump(buf, 'Test_popupwin_longtitle_4', {}) call term_sendkeys(buf, ":call popup_clear()\<CR>") - call term_sendkeys(buf, ":call popup_menu(['This is a line', 'and another line'], #{title: '▶ÄÖÜ◀', })\<CR>") + call term_sendkeys(buf, ":call popup_menu(['This is a line', 'and another line'], #{title: '▶Äあいうえお◀', })\<CR>") call VerifyScreenDump(buf, 'Test_popupwin_multibytetitle', {}) call term_sendkeys(buf, "x")