aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.0.1790: 'winfixwidth' is not always respected by :close

Browse Source 
Problem:    'winfixwidth' is not always respected by :close.
Solution:   Prefer a frame without 'winfixwidth' or 'winfixheight'. (Jason
            Franklin)
This commit is contained in:
Bram Moolenaar
2018-05-04 20:15:38 +02:00
parent 606cb8b08e
commit c136af29c0
3 changed files with 74 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/window.c
View File

@@ -2740,12 +2740,14 @@ winframe_remove(
}
/*
* Find out which frame is going to get the freed up space when "win" is
* closed.
* if 'splitbelow'/'splitleft' the space goes to the window above/left.
* if 'nosplitbelow'/'nosplitleft' the space goes to the window below/right.
* This makes opening a window and closing it immediately keep the same window
* layout.
* Return a pointer to the frame that will receive the empty screen space that
* is left over after "win" is closed.
*
* If 'splitbelow' or 'splitright' is set, the space goes above or to the left
* by default. Otherwise, the free space goes below or to the right. The
* result is that opening a window and then immediately closing it will
* preserve the initial window layout. The 'wfh' and 'wfw' settings are
* respected when possible.
*/
static frame_T *
win_altframe(
@@ -2753,20 +2755,40 @@ win_altframe(
tabpage_T *tp) /* tab page "win" is in, NULL for current */
{
frame_T *frp;
int b;
frame_T *other_fr, *target_fr;
if (tp == NULL ? ONE_WINDOW : tp->tp_firstwin == tp->tp_lastwin)
/* Last window in this tab page, will go to next tab page. */
return alt_tabpage()->tp_curwin->w_frame;
frp = win->w_frame;
if (frp->fr_parent != NULL && frp->fr_parent->fr_layout == FR_ROW)
b = p_spr;
else
b = p_sb;
if ((!b && frp->fr_next != NULL) || frp->fr_prev == NULL)
if (frp->fr_prev == NULL)
return frp->fr_next;
return frp->fr_prev;
if (frp->fr_next == NULL)
return frp->fr_prev;
target_fr = frp->fr_next;
other_fr = frp->fr_prev;
if (p_spr || p_sb)
{
target_fr = frp->fr_prev;
other_fr = frp->fr_next;
}
/* If 'wfh' or 'wfw' is set for the target and not for the alternate
* window, reverse the selection. */
if (frp->fr_parent != NULL && frp->fr_parent->fr_layout == FR_ROW)
{
if (frame_fixed_width(target_fr) && !frame_fixed_width(other_fr))
target_fr = other_fr;
}
else
{
if (frame_fixed_height(target_fr) && !frame_fixed_height(other_fr))
target_fr = other_fr;
}
return target_fr;
}
/*