circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-08 10:54:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/tmux-openbsd/master'

Browse Source 
* refs/remotes/tmux-openbsd/master:
  Correctly include status line in pane height.
This commit is contained in:
tmux update bot
2026-07-20 11:14:58 +00:00
parent afb3e954bf efcfc55535
commit 88a91b9f83
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
format.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: format.c,v 1.406 2026/07/19 17:36:38 nicm Exp $ */ /* $OpenBSD: format.c,v 1.407 2026/07/20 07:42:13 nicm Exp $ */
/* /*
* Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -2585,7 +2585,7 @@ format_cb_pane_unzoomed_height(struct format_tree *ft)
struct window_pane *wp = ft->wp; struct window_pane *wp = ft->wp;
struct window *w; struct window *w;
struct layout_cell *lc, *root; struct layout_cell *lc, *root;
int status; int status, floating;
u_int sy; u_int sy;
if (wp == NULL) if (wp == NULL)
@@ -2598,12 +2598,16 @@ format_cb_pane_unzoomed_height(struct format_tree *ft)
if (lc == NULL) if (lc == NULL)
return (NULL); return (NULL);
sy = lc->g.sy; sy = lc->g.sy;
floating = (lc->flags & LAYOUT_CELL_FLOATING);
root = w->saved_layout_root; root = w->saved_layout_root;
if (root == NULL) if (root == NULL)
root = w->layout_root; root = w->layout_root;
status = window_pane_get_pane_status(wp); if (lc == wp->saved_layout_cell && !floating)
if (!window_pane_is_floating(wp) && status = window_get_pane_status(w);
else
status = window_pane_get_pane_status(wp);
if (!floating &&
root != NULL && root != NULL &&
layout_add_horizontal_border(root, lc, status) && layout_add_horizontal_border(root, lc, status) &&
sy > 1) sy > 1)