circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-06-03 16:46:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-05-31 22:00:06 +01:00
parent 74b91d6dec e3ee2b327b
commit b17dcc6773
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
window.c
View File

@@ -2137,7 +2137,7 @@ window_pane_floating_geometry(struct window *w, __unused struct window_pane *wp,
u_int *out_x, u_int *out_y, u_int *out_sx, u_int *out_sy,
struct cmdq_item *item, struct args *args, char **cause)
{
u_int x, y, sx = w->sx / 2, sy = w->sy / 2;
u_int x, y, sx = w->sx / 2, sy = w->sy / 4;
if (args_has(args, 'x')) {
sx = args_percentage_and_expand(args, 'x', 0, USHRT_MAX, w->sx,
@@ -2162,8 +2162,12 @@ window_pane_floating_geometry(struct window *w, __unused struct window_pane *wp,
x = 4;
else {
x = w->last_new_pane_x + 4;
if (w->last_new_pane_x > w->sx)
if (x + sx >= w->sx) {
w->last_new_pane_x = 0;
w->last_new_pane_y = 0;
x = 4;
y = 2;
}
}
w->last_new_pane_x = x;
}
@@ -2177,8 +2181,12 @@ window_pane_floating_geometry(struct window *w, __unused struct window_pane *wp,
y = 2;
else {
y = w->last_new_pane_y + 2;
if (w->last_new_pane_y > w->sy)
if (y + sy >= w->sy) {
w->last_new_pane_x = 0;
w->last_new_pane_y = 0;
x = 4;
y = 2;
}
}
w->last_new_pane_y = y;
}