aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-10-17 22:04:26 +0800
committerGitHub <noreply@github.com>2022-10-17 22:04:26 +0800
commit8ebf2345339a0b2a35dc3eea15770bd71a1ee7f5 (patch)
tree7a977e5685d2058dca7b3573423720bfe4807c10 /src
parent637ab296cba9e37e7374a8c076342487398605ee (diff)
parent14a84ec169ca8ca29a80237e82f2bb8e15a28365 (diff)
downloadrneovim-8ebf2345339a0b2a35dc3eea15770bd71a1ee7f5.tar.gz
rneovim-8ebf2345339a0b2a35dc3eea15770bd71a1ee7f5.tar.bz2
rneovim-8ebf2345339a0b2a35dc3eea15770bd71a1ee7f5.zip
Merge pull request #20685 from luukvbaal/scroll
fix: 'scroll' is not set correctly for floats with 'splitkeep'
Diffstat (limited to 'src')
-rw-r--r--src/nvim/window.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 002d95ac2a..7c246191a5 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -6119,7 +6119,6 @@ void win_fix_scroll(int resize)
invalidate_botline_win(wp);
validate_botline(wp);
}
- win_comp_scroll(wp);
wp->w_prev_height = wp->w_height;
wp->w_prev_winrow = wp->w_winrow;
}
@@ -6292,7 +6291,6 @@ void scroll_to_fraction(win_T *wp, int prev_height)
wp->w_prev_fraction_row = wp->w_wrow;
}
- win_comp_scroll(wp);
redraw_later(wp, UPD_SOME_VALID);
wp->w_redr_status = true;
invalidate_botline_win(wp);
@@ -6327,6 +6325,7 @@ void win_set_inner_size(win_T *wp, bool valid_cursor)
}
wp->w_skipcol = 0;
wp->w_height_inner = height;
+ win_comp_scroll(wp);
// There is no point in adjusting the scroll position when exiting. Some
// values might be invalid.