diff options
| author | bfredl <bjorn.linse@gmail.com> | 2022-05-18 21:18:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-18 21:18:34 +0200 |
| commit | 6f0baa0bb7a57ec4451047876321eb6f24130b10 (patch) | |
| tree | 4257741199bb61a7fc76b6f794445b6f74b85a16 /src/nvim/api | |
| parent | 3eea66d65a75c83cbd6bd7ec2aa0886781c807c9 (diff) | |
| parent | 503d8b0892dbfee2d69286574f7eba3708b9a902 (diff) | |
| download | rneovim-6f0baa0bb7a57ec4451047876321eb6f24130b10.tar.gz rneovim-6f0baa0bb7a57ec4451047876321eb6f24130b10.tar.bz2 rneovim-6f0baa0bb7a57ec4451047876321eb6f24130b10.zip | |
Merge pull request #18620 from bfredl/multibar
fix(ui): make winbar work with floats and multigrid
Diffstat (limited to 'src/nvim/api')
| -rw-r--r-- | src/nvim/api/ui.c | 6 | ||||
| -rw-r--r-- | src/nvim/api/vim.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c index b4d20ed975..52f76f4650 100644 --- a/src/nvim/api/ui.c +++ b/src/nvim/api/ui.c @@ -349,7 +349,11 @@ void nvim_ui_try_resize_grid(uint64_t channel_id, Integer grid, Integer width, I return; } - ui_grid_resize((handle_T)grid, (int)width, (int)height, err); + if (grid == DEFAULT_GRID_HANDLE) { + nvim_ui_try_resize(channel_id, width, height, err); + } else { + ui_grid_resize((handle_T)grid, (int)width, (int)height, err); + } } /// Tells Nvim the number of elements displaying in the popumenu, to decide diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index 3c378e73e1..15992a98be 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -2140,8 +2140,8 @@ Array nvim__inspect_cell(Integer grid, Integer row, Integer col, Error *err) } } - if (row < 0 || row >= g->Rows - || col < 0 || col >= g->Columns) { + if (row < 0 || row >= g->rows + || col < 0 || col >= g->cols) { return ret; } size_t off = g->line_offset[(size_t)row] + (size_t)col; |