Merge remote-tracking branch 'upstream/master' into atomic

This commit is contained in:
Ryan Dwyer 2018-06-11 11:03:43 +10:00
commit 9e96cfd310
17 changed files with 507 additions and 41 deletions

View file

@ -82,6 +82,10 @@ void transaction_add_container(struct sway_transaction *transaction,
state->swayc_y = container->y;
state->swayc_width = container->width;
state->swayc_height = container->height;
state->has_gaps = container->has_gaps;
state->current_gaps = container->current_gaps;
state->gaps_inner = container->gaps_inner;
state->gaps_outer = container->gaps_outer;
if (container->type == C_VIEW) {
struct sway_view *view = container->sway_view;