kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-29 14:41:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

window.c: fix floating window border width calculation

Browse Source 
* lift calculation of w_border_adj into win_config_float
* Check max floating window height and width against
  w_{height,width}_outer when positioning window
This commit is contained in:
Michael Lingelbach 2021-05-02 23:34:07 -07:00
parent 26bd5a58df
commit d45e168a1d
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/window.c
View File

@ -676,9 +676,17 @@ void win_config_float(win_T *wp, FloatConfig fconfig)
wp->w_float_config = fconfig;
bool has_border = wp->w_floating && wp->w_float_config.border;
for (int i = 0; i < 4; i++) {
wp->w_border_adj[i] =
has_border && wp->w_float_config.border_chars[2 * i+1][0];
}
if (!ui_has(kUIMultigrid)) {
wp->w_height = MIN(wp->w_height, Rows-1);
wp->w_width = MIN(wp->w_width, Columns);
wp->w_height = MIN(wp->w_height,
Rows - 1 - (wp->w_border_adj[0] + wp->w_border_adj[2]));
wp->w_width = MIN(wp->w_width,
Columns - (wp->w_border_adj[1] + wp->w_border_adj[3]));
}
win_set_inner_size(wp);
@ -767,8 +775,8 @@ void ui_ext_win_position(win_T *wp)
int comp_row = (int)row - (south ? wp->w_height : 0);
int comp_col = (int)col - (east ? wp->w_width : 0);
comp_row = MAX(MIN(comp_row, Rows-wp->w_height-1), 0);
comp_col = MAX(MIN(comp_col, Columns-wp->w_width), 0);
comp_row = MAX(MIN(comp_row, Rows-wp->w_height_outer-1), 0);
comp_col = MAX(MIN(comp_col, Columns-wp->w_width_outer), 0);
wp->w_winrow = comp_row;
wp->w_wincol = comp_col;
bool valid = (wp->w_redr_type == 0);
@ -5735,12 +5743,6 @@ void win_set_inner_size(win_T *wp)
terminal_check_size(wp->w_buffer->terminal);
}
bool has_border = wp->w_floating && wp->w_float_config.border;
for (int i = 0; i < 4; i++) {
wp->w_border_adj[i] =
has_border && wp->w_float_config.border_chars[2 * i+1][0];
}
wp->w_height_outer = (wp->w_height_inner
+ wp->w_border_adj[0] + wp->w_border_adj[2]);
wp->w_width_outer = (wp->w_width_inner