circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-06-22 08:36:55 +00:00
Code Issues Projects Releases Wiki Activity

bugfix

Browse Source 
There is a signature and functionality mismatch with the recent merge in
`layout_floating_pane` that has been fixed. It now more gracefully
handles inputs.
This commit is contained in:
Dane Jensen
2026-06-20 12:22:08 -07:00
parent 4eb96fc144
commit 19843cd826
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
layout.c
View File

@@ -1429,9 +1429,11 @@ struct layout_cell *
layout_floating_pane(struct window *w, struct window_pane *wp, u_int sx, layout_floating_pane(struct window *w, struct window_pane *wp, u_int sx,
u_int sy, int ox, int oy) u_int sy, int ox, int oy)
{ {
struct layout_cell *lc = wp->layout_cell, *lcnew, *lcparent; struct layout_cell *lc, *lcnew, *lcparent;
if (lc == NULL) if (wp != NULL)
lc = wp->layout_cell;
else
lc = w->layout_root; lc = w->layout_root;
lcparent = lc->parent; lcparent = lc->parent;

2
spawn.c
View File

@@ -660,7 +660,7 @@ spawn_editor(struct client *c, const char *buf, size_t len,
px = w->sx / 2 - sx / 2; px = w->sx / 2 - sx / 2;
py = w->sy / 2 - sy / 2; py = w->sy / 2 - sy / 2;
window_push_zoom(w, 1, 0); window_push_zoom(w, 1, 0);
lc = layout_floating_pane(w, sx, sy, px, py); lc = layout_floating_pane(w, NULL, sx, sy, px, py);
if (lc == NULL) { if (lc == NULL) {
spawn_editor_free(es); spawn_editor_free(es);
return (NULL); return (NULL);