patch 9.1.0175: wrong window positions with 'winfix{width,height}'
Problem: winframe functions incorrectly recompute window positions if
the altframe wasn't adjacent to the closed frame, which is
possible if adjacent windows had 'winfix{width,height}' set.
Solution: recompute for windows within the parent of the altframe and
closed frame. Skip this (as before) if the altframe was
top/left, but only if adjacent to the closed frame, as
positions won't change in that case. Also correct the return
value documentation for win_screenpos. (Sean Dewar)
The issue revealed itself after removing the win_comp_pos call below
winframe_restore in win_splitmove. Similarly, wrong positions could result from
windows closed in other tabpages, as win_free_mem uses winframe_remove (at least
until it is entered later, where enter_tabpage calls win_comp_pos).
NOTE: As win_comp_pos handles only curtab, it's possible via other means for
positions in non-current tabpages to be wrong (e.g: after changing 'laststatus',
'showtabline', etc.). Given enter_tabpage recomputes it, maybe it's intentional
as an optimization? Should probably be documented in win_screenpos then, but I
won't address that here.
closes: #14191
Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/window.c b/src/window.c
index fbdad9c..9ffca77 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3493,6 +3493,7 @@
frame_T *frp, *frp2, *frp3;
frame_T *frp_close = win->w_frame;
win_T *wp;
+ int row, col;
/*
* If there is only one window there is nothing to remove.
@@ -3500,6 +3501,12 @@
if (tp == NULL ? ONE_WINDOW : tp->tp_firstwin == tp->tp_lastwin)
return NULL;
+ // Save the position of the containing frame (which will also contain the
+ // altframe) before we remove anything, to recompute window positions later.
+ wp = frame2win(frp_close->fr_parent);
+ row = wp->w_winrow;
+ col = wp->w_wincol;
+
/*
* Remove the window from its frame.
*/
@@ -3584,15 +3591,10 @@
*dirp = 'h';
}
- // If rows/columns go to a window below/right its positions need to be
- // updated. Can only be done after the sizes have been updated.
- if (frp2 == frp_close->fr_next)
- {
- int row = win->w_winrow;
- int col = win->w_wincol;
-
- frame_comp_pos(frp2, &row, &col);
- }
+ // If the altframe wasn't adjacent and left/above, resizing it will have
+ // changed window positions within the parent frame. Recompute them.
+ if (frp2 != frp_close->fr_prev)
+ frame_comp_pos(frp_close->fr_parent, &row, &col);
if (unflat_altfr == NULL)
frame_flatten(frp2);
@@ -3666,8 +3668,6 @@
winframe_restore(win_T *wp, int dir, frame_T *unflat_altfr)
{
frame_T *frp = wp->w_frame;
- int row = wp->w_winrow;
- int col = wp->w_wincol;
// Put "wp"'s frame back where it was.
if (frp->fr_prev != NULL)
@@ -3691,19 +3691,23 @@
{
frame_new_height(unflat_altfr, unflat_altfr->fr_height - frp->fr_height,
unflat_altfr == frp->fr_next, FALSE);
- row += frp->fr_height;
}
else if (dir == 'h')
{
frame_new_width(unflat_altfr, unflat_altfr->fr_width - frp->fr_width,
unflat_altfr == frp->fr_next, FALSE);
- col += frp->fr_width;
}
- // If rows/columns went to a window below/right, its positions need to be
- // restored. Can only be done after the sizes have been updated.
- if (unflat_altfr == frp->fr_next)
- frame_comp_pos(unflat_altfr, &row, &col);
+ // Recompute window positions within the parent frame to restore them.
+ // Positions were unchanged if the altframe was adjacent and left/above.
+ if (unflat_altfr != frp->fr_prev)
+ {
+ win_T *topleft = frame2win(frp->fr_parent);
+ int row = topleft->w_winrow;
+ int col = topleft->w_wincol;
+
+ frame_comp_pos(frp->fr_parent, &row, &col);
+ }
}
/*