circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2018-09-24 17:02:38 +01:00
parent ad71e7f9d2 7bc6c105b7
commit 4799f43298
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
layout.c
View File

@ -236,7 +236,7 @@ layout_need_status(struct layout_cell *lc, int at_top)
{ {
struct layout_cell *first_lc; struct layout_cell *first_lc;
if (lc->parent) { if (lc->parent != NULL) {
if (lc->parent->type == LAYOUT_LEFTRIGHT) if (lc->parent->type == LAYOUT_LEFTRIGHT)
return (layout_need_status(lc->parent, at_top)); return (layout_need_status(lc->parent, at_top));
@ -307,7 +307,9 @@ layout_resize_check(struct window *w, struct layout_cell *lc,
{ {
struct layout_cell *lcchild; struct layout_cell *lcchild;
u_int available, minimum; u_int available, minimum;
int status;
status = options_get_number(w->options, "pane-border-status");
if (lc->type == LAYOUT_WINDOWPANE) { if (lc->type == LAYOUT_WINDOWPANE) {
/* Space available in this cell only. */ /* Space available in this cell only. */
minimum = PANE_MINIMUM; minimum = PANE_MINIMUM;
@ -315,9 +317,8 @@ layout_resize_check(struct window *w, struct layout_cell *lc,
available = lc->sx; available = lc->sx;
else { else {
available = lc->sy; available = lc->sy;
minimum += layout_need_status(lc, if (status != 0)
options_get_number(w->options, minimum += layout_need_status(lc, status == 1);
"pane-border-status") == 1);
} }
if (available > minimum) if (available > minimum)
available -= minimum; available -= minimum;