diff options
| author | Thomas Adam <thomas@xteddy.org> | 2023-01-17 10:01:09 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2023-01-17 10:01:09 +0000 |
| commit | f416ae1c12eaf6f3fde85e87e8a296f3424e7428 (patch) | |
| tree | e92d7eb52220a613760e63984ffbb26b81832f5b | |
| parent | 789cb91f311c1030f20d0b711793e0a9bdacba7a (diff) | |
| parent | d578cf8d3fa1e42ab14b9ec9499f31c6b9c6f384 (diff) | |
| download | rtmux-f416ae1c12eaf6f3fde85e87e8a296f3424e7428.tar.gz rtmux-f416ae1c12eaf6f3fde85e87e8a296f3424e7428.tar.bz2 rtmux-f416ae1c12eaf6f3fde85e87e8a296f3424e7428.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | cmd-break-pane.c | 1 | ||||
| -rw-r--r-- | cmd-join-pane.c | 1 | ||||
| -rw-r--r-- | cmd-swap-pane.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/cmd-break-pane.c b/cmd-break-pane.c index 4f38d4bd..9c4b1508 100644 --- a/cmd-break-pane.c +++ b/cmd-break-pane.c @@ -115,6 +115,7 @@ cmd_break_pane_exec(struct cmd *self, struct cmdq_item *item) layout_init(w, wp); wp->flags |= PANE_CHANGED; + colour_palette_from_option(&wp->palette, wp->options); if (idx == -1) idx = -1 - options_get_number(dst_s->options, "base-index"); diff --git a/cmd-join-pane.c b/cmd-join-pane.c index e82b4cde..da1ba9ae 100644 --- a/cmd-join-pane.c +++ b/cmd-join-pane.c @@ -155,6 +155,7 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item) else TAILQ_INSERT_AFTER(&dst_w->panes, dst_wp, src_wp, entry); layout_assign_pane(lc, src_wp, 0); + colour_palette_from_option(&src_wp->palette, src_wp->options); recalculate_sizes(); diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c index 4191b894..80c20c80 100644 --- a/cmd-swap-pane.c +++ b/cmd-swap-pane.c @@ -132,6 +132,8 @@ cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item) src_w->last = NULL; if (dst_w->last == dst_wp) dst_w->last = NULL; + colour_palette_from_option(&src_wp->palette, src_wp->options); + colour_palette_from_option(&dst_wp->palette, dst_wp->options); } server_redraw_window(src_w); server_redraw_window(dst_w); |