Mercurial > vim

comparison src/popupwin.c @ 17561:724370d05e79 v8.1.1778

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1778: not showing the popup window right border is confusing commit https://github.com/vim/vim/commit/8c8b88d0ccb7204bb829669885c2e886b7f483bf Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jul 30 20:32:41 2019 +0200 patch 8.1.1778: not showing the popup window right border is confusing Problem: Not showing the popup window right border is confusing. Solution: Also show the border when there is no close button. (closes https://github.com/vim/vim/issues/4747)
author Bram Moolenaar <Bram@vim.org>
date Tue, 30 Jul 2019 20:45:07 +0200
parents 8cca2654d459
children cc2c4179427c
comparison
equal deleted inserted replaced
17560:200aa0003874 17561:724370d05e79
1078 1078
1079 if (wp->w_p_wrap) 1079 if (wp->w_p_wrap)
1080 { 1080 {
1081 int want_col = 0; 1081 int want_col = 0;
1082 1082
1083 if (wp->w_popup_close == POPCLOSE_BUTTON) 1083 // try to show the right border and any scrollbar
1084 // try to show the close button 1084 want_col = left_extra + wp->w_width + right_extra;
1085 want_col = left_extra + wp->w_width + right_extra;
1086 else if (wp->w_has_scrollbar)
1087 // try to show the scrollbar
1088 want_col = left_extra + wp->w_width
1089 + right_extra - wp->w_popup_border[1];
1090 if (want_col > 0 && wp->w_wincol > 0 1085 if (want_col > 0 && wp->w_wincol > 0
1091 && wp->w_wincol + want_col >= Columns) 1086 && wp->w_wincol + want_col >= Columns)
1092 { 1087 {
1093 wp->w_wincol = Columns - want_col; 1088 wp->w_wincol = Columns - want_col;
1094 if (wp->w_wincol < 0) 1089 if (wp->w_wincol < 0)