circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-06-04 09:20:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into floating_panes

Browse Source
This commit is contained in:
Nicholas Marriott
2026-06-02 10:11:33 +01:00
parent 17974ea7a0 e89f02bd8f
commit 6bed37be10
14 changed files with 70 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
layout.c
View File

@@ -58,6 +58,7 @@ layout_create_cell(struct layout_cell *lcparent)
lc = xmalloc(sizeof *lc);
lc->type = LAYOUT_WINDOWPANE;
lc->flags = 0;
lc->parent = lcparent;
TAILQ_INIT(&lc->cells);
@@ -363,7 +364,7 @@ layout_fix_panes(struct window *w, struct window_pane *skip)
sx = lc->sx;
sy = lc->sy;
if ((~wp->flags & PANE_FLOATING) &&
if (!window_pane_is_floating(wp) &&
layout_add_horizontal_border(w, lc, status)) {
if (status == PANE_STATUS_TOP)
wp->yoff++;
@@ -620,7 +621,7 @@ layout_destroy_cell(struct window *w, struct layout_cell *lc,
*/
lcparent = lc->parent;
if (lcparent == NULL) {
if (lc->wp != NULL && ~lc->wp->flags & PANE_FLOATING)
if (lc->wp != NULL && !window_pane_is_floating(lc->wp))
*lcroot = NULL;
layout_free_cell(lc);
return;