diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-11-01 01:03:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-01 01:03:41 +0100 |
| commit | 480b03b734e6d1d068859b254d8ace4fb07b2c54 (patch) | |
| tree | 131faacd2b7c36e37444441cb0fd719c00818486 /sway/desktop/transaction.c | |
| parent | 35fda6765b154c1824b3e347579b9d41b309212c (diff) | |
| parent | 528c7495bb09e18a8b63e1c741b90f65ff5541c6 (diff) | |
Merge pull request #3040 from RyanDwyer/border-props-to-container
Move view border properties to container struct
Diffstat (limited to 'sway/desktop/transaction.c')
| -rw-r--r-- | sway/desktop/transaction.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c index c3efb210..44156d41 100644 --- a/sway/desktop/transaction.c +++ b/sway/desktop/transaction.c @@ -137,6 +137,12 @@ static void copy_container_state(struct sway_container *container, state->is_fullscreen = container->is_fullscreen; state->parent = container->parent; state->workspace = container->workspace; + state->border = container->border; + state->border_thickness = container->border_thickness; + state->border_top = container->border_top; + state->border_left = container->border_left; + state->border_right = container->border_right; + state->border_bottom = container->border_bottom; if (container->view) { struct sway_view *view = container->view; @@ -144,12 +150,6 @@ static void copy_container_state(struct sway_container *container, state->view_y = view->y; state->view_width = view->width; state->view_height = view->height; - state->border = view->border; - state->border_thickness = view->border_thickness; - state->border_top = view->border_top; - state->border_left = view->border_left; - state->border_right = view->border_right; - state->border_bottom = view->border_bottom; } else { state->children = create_list(); list_cat(state->children, container->children); |