diff options
author | Thomas Adam <thomas@xteddy.org> | 2021-03-11 08:01:29 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2021-03-11 08:01:29 +0000 |
commit | 12cfd0d22b630ead9c6d739b13c3409485ea551c (patch) | |
tree | ee2535b2b0e0075078cae6a2eb0bf5171d11078d /window.c | |
parent | 541872bc5754a8f4daa84f23043c356f7ac4f663 (diff) | |
parent | ee0df1b8f8a9099fbd67a73c9fb20b89c64d6106 (diff) | |
download | rtmux-12cfd0d22b630ead9c6d739b13c3409485ea551c.tar.gz rtmux-12cfd0d22b630ead9c6d739b13c3409485ea551c.tar.bz2 rtmux-12cfd0d22b630ead9c6d739b13c3409485ea551c.zip |
Merge branch 'obsd-master' into master
Diffstat (limited to 'window.c')
-rw-r--r-- | window.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -629,18 +629,18 @@ window_unzoom(struct window *w) wp->layout_cell = wp->saved_layout_cell; wp->saved_layout_cell = NULL; } - layout_fix_panes(w); + layout_fix_panes(w, NULL); notify_window("window-layout-changed", w); return (0); } int -window_push_zoom(struct window *w, int flag) +window_push_zoom(struct window *w, int always, int flag) { log_debug("%s: @%u %d", __func__, w->id, flag && (w->flags & WINDOW_ZOOMED)); - if (flag && (w->flags & WINDOW_ZOOMED)) + if (flag && (always || (w->flags & WINDOW_ZOOMED))) w->flags |= WINDOW_WASZOOMED; else w->flags &= ~WINDOW_WASZOOMED; |