Permalink
Browse files

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

Problem:    'winfixwidth' is not always respected by :close.
Solution:   Prefer a frame without 'winfixwidth' or 'winfixheight'. (Jason
            Franklin)
  • Loading branch information...
brammool committed May 4, 2018
1 parent 606cb8b commit c136af29c0b1939076fbae7d36afd90dce740315
Showing with 73 additions and 13 deletions.
  1. +36 −0 src/testdir/test_winbuf_close.vim
  2. +2 −0 src/version.c
  3. +35 −13 src/window.c
@@ -122,3 +122,39 @@ func Test_winbuf_close()
call delete('Xtest2')
call delete('Xtest3')
endfunc
" Test that ":close" will respect 'winfixheight' when possible.
func Test_winfixheight_on_close()
set nosplitbelow nosplitright
split | split | vsplit
$wincmd w
setlocal winfixheight
let l:height = winheight(0)
3close
call assert_equal(l:height, winheight(0))
%bwipeout!
setlocal nowinfixheight splitbelow& splitright&
endfunc
" Test that ":close" will respect 'winfixwidth' when possible.
func Test_winfixwidth_on_close()
set nosplitbelow nosplitright
vsplit | vsplit | split
$wincmd w
setlocal winfixwidth
let l:width = winwidth(0)
3close
call assert_equal(l:width, winwidth(0))
%bwipeout!
setlocal nowinfixwidth splitbelow& splitright&
endfunction
@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1790,
/**/
1789,
/**/
@@ -2740,33 +2740,55 @@ 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(
win_T *win,
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_prev == NULL)
return frp->fr_next;
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)
b = p_spr;
{
if (frame_fixed_width(target_fr) && !frame_fixed_width(other_fr))
target_fr = other_fr;
}
else
b = p_sb;
if ((!b && frp->fr_next != NULL) || frp->fr_prev == NULL)
return frp->fr_next;
return frp->fr_prev;
{
if (frame_fixed_height(target_fr) && !frame_fixed_height(other_fr))
target_fr = other_fr;
}
return target_fr;
}
/*

0 comments on commit c136af2

Please sign in to comment.