diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-03-11 08:41:19 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-03-11 08:41:19 +0000 |
| commit | 46cbbe3d4566885b8ad4235598389936f63c2c01 (patch) | |
| tree | 08d62878ba077a0027ece4ae562d77b160a2d9c1 /window.c | |
| parent | 7bef887fd1051e2bbeb268888b51588ccaac306e (diff) | |
| parent | ef9700816fd2bd521bab837ccd85e0a596aa3aa8 (diff) | |
| download | rtmux-46cbbe3d4566885b8ad4235598389936f63c2c01.tar.gz rtmux-46cbbe3d4566885b8ad4235598389936f63c2c01.tar.bz2 rtmux-46cbbe3d4566885b8ad4235598389936f63c2c01.zip | |
Merge branch 'master' into 3.2-rc
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; |