diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-31 20:28:36 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-31 23:56:20 +1000 |
commit | 528c7495bb09e18a8b63e1c741b90f65ff5541c6 (patch) | |
tree | b1dddeefb15f2511b33f7bed52d0df3b4110d8f8 /sway/desktop/transaction.c | |
parent | Merge pull request #3031 from atomnuker/master (diff) | |
download | sway-528c7495bb09e18a8b63e1c741b90f65ff5541c6.tar.gz sway-528c7495bb09e18a8b63e1c741b90f65ff5541c6.tar.zst sway-528c7495bb09e18a8b63e1c741b90f65ff5541c6.zip |
Move view border properties to container struct
This will be needed to implement layout saving and restoring, as we need
to be able to configure borders on a placeholder container which has no
view.
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, | |||
137 | state->is_fullscreen = container->is_fullscreen; | 137 | state->is_fullscreen = container->is_fullscreen; |
138 | state->parent = container->parent; | 138 | state->parent = container->parent; |
139 | state->workspace = container->workspace; | 139 | state->workspace = container->workspace; |
140 | state->border = container->border; | ||
141 | state->border_thickness = container->border_thickness; | ||
142 | state->border_top = container->border_top; | ||
143 | state->border_left = container->border_left; | ||
144 | state->border_right = container->border_right; | ||
145 | state->border_bottom = container->border_bottom; | ||
140 | 146 | ||
141 | if (container->view) { | 147 | if (container->view) { |
142 | struct sway_view *view = container->view; | 148 | struct sway_view *view = container->view; |
@@ -144,12 +150,6 @@ static void copy_container_state(struct sway_container *container, | |||
144 | state->view_y = view->y; | 150 | state->view_y = view->y; |
145 | state->view_width = view->width; | 151 | state->view_width = view->width; |
146 | state->view_height = view->height; | 152 | state->view_height = view->height; |
147 | state->border = view->border; | ||
148 | state->border_thickness = view->border_thickness; | ||
149 | state->border_top = view->border_top; | ||
150 | state->border_left = view->border_left; | ||
151 | state->border_right = view->border_right; | ||
152 | state->border_bottom = view->border_bottom; | ||
153 | } else { | 153 | } else { |
154 | state->children = create_list(); | 154 | state->children = create_list(); |
155 | list_cat(state->children, container->children); | 155 | list_cat(state->children, container->children); |