IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

term: use window col offset to calculate width

Browse Source 
fixes #2317
This commit is contained in:
Scott Prager 2015-04-05 16:07:54 -04:00
parent b8ae09b3cf
commit 013bd4461d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/terminal.c
View File

@ -338,7 +338,7 @@ void terminal_resize(Terminal *term, uint16_t width, uint16_t height)
// terminal in the current tab. // terminal in the current tab.
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) { FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
if (!wp->w_closing && wp->w_buffer == term->buf) { if (!wp->w_closing && wp->w_buffer == term->buf) {
width = (uint16_t)MIN(width, (uint16_t)wp->w_width); width = (uint16_t)MIN(width, (uint16_t)(wp->w_width - win_col_off(wp)));
height = (uint16_t)MIN(height, (uint16_t)wp->w_height); height = (uint16_t)MIN(height, (uint16_t)wp->w_height);
} }
} }
@ -358,6 +358,9 @@ void terminal_enter(bool process_deferred)
Terminal *term = curbuf->terminal; Terminal *term = curbuf->terminal;
assert(term && "should only be called when curbuf has a terminal"); assert(term && "should only be called when curbuf has a terminal");
// Ensure the terminal is properly sized.
terminal_resize(term, 0, 0);
checkpcmark(); checkpcmark();
setpcmark(); setpcmark();
int save_state = State; int save_state = State;