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/eval/funcs.c | |
| 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/eval/funcs.c')
| -rw-r--r-- | src/nvim/eval/funcs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index ad133b5b5f..683b035f5b 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -8047,8 +8047,8 @@ static void f_screenattr(typval_T *argvars, typval_T *rettv, FunPtr fptr) int row = (int)tv_get_number_chk(&argvars[0], NULL) - 1; int col = (int)tv_get_number_chk(&argvars[1], NULL) - 1; - if (row < 0 || row >= default_grid.Rows - || col < 0 || col >= default_grid.Columns) { + if (row < 0 || row >= default_grid.rows + || col < 0 || col >= default_grid.cols) { c = -1; } else { ScreenGrid *grid = &default_grid; @@ -8065,8 +8065,8 @@ static void f_screenchar(typval_T *argvars, typval_T *rettv, FunPtr fptr) int row = tv_get_number_chk(&argvars[0], NULL) - 1; int col = tv_get_number_chk(&argvars[1], NULL) - 1; - if (row < 0 || row >= default_grid.Rows - || col < 0 || col >= default_grid.Columns) { + if (row < 0 || row >= default_grid.rows + || col < 0 || col >= default_grid.cols) { c = -1; } else { ScreenGrid *grid = &default_grid; @@ -8081,8 +8081,8 @@ static void f_screenchars(typval_T *argvars, typval_T *rettv, FunPtr fptr) { int row = tv_get_number_chk(&argvars[0], NULL) - 1; int col = tv_get_number_chk(&argvars[1], NULL) - 1; - if (row < 0 || row >= default_grid.Rows - || col < 0 || col >= default_grid.Columns) { + if (row < 0 || row >= default_grid.rows + || col < 0 || col >= default_grid.cols) { tv_list_alloc_ret(rettv, 0); return; } @@ -8148,8 +8148,8 @@ static void f_screenstring(typval_T *argvars, typval_T *rettv, FunPtr fptr) rettv->v_type = VAR_STRING; int row = tv_get_number_chk(&argvars[0], NULL) - 1; int col = tv_get_number_chk(&argvars[1], NULL) - 1; - if (row < 0 || row >= default_grid.Rows - || col < 0 || col >= default_grid.Columns) { + if (row < 0 || row >= default_grid.rows + || col < 0 || col >= default_grid.cols) { return; } ScreenGrid *grid = &default_grid; |