diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-06 19:19:30 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-09 10:08:43 +1000 |
commit | f9e6d703d298dbdee0770fd9e0c64ab2d7ac7deb (patch) | |
tree | 8c8ffd879e368aff3d749a637aabfa784800db5c /sway/tree/layout.c | |
parent | WIP: Atomic layout updates ground work (diff) | |
download | sway-f9e6d703d298dbdee0770fd9e0c64ab2d7ac7deb.tar.gz sway-f9e6d703d298dbdee0770fd9e0c64ab2d7ac7deb.tar.zst sway-f9e6d703d298dbdee0770fd9e0c64ab2d7ac7deb.zip |
Make main properties be the pending state
Diffstat (limited to 'sway/tree/layout.c')
-rw-r--r-- | sway/tree/layout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 3bba049a..6d4cd088 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c | |||
@@ -915,10 +915,10 @@ void container_recursive_resize(struct sway_container *container, | |||
915 | bool layout_match = true; | 915 | bool layout_match = true; |
916 | wlr_log(L_DEBUG, "Resizing %p with amount: %f", container, amount); | 916 | wlr_log(L_DEBUG, "Resizing %p with amount: %f", container, amount); |
917 | if (edge == RESIZE_EDGE_LEFT || edge == RESIZE_EDGE_RIGHT) { | 917 | if (edge == RESIZE_EDGE_LEFT || edge == RESIZE_EDGE_RIGHT) { |
918 | container->pending.swayc_width += amount; | 918 | container->width += amount; |
919 | layout_match = container->layout == L_HORIZ; | 919 | layout_match = container->layout == L_HORIZ; |
920 | } else if (edge == RESIZE_EDGE_TOP || edge == RESIZE_EDGE_BOTTOM) { | 920 | } else if (edge == RESIZE_EDGE_TOP || edge == RESIZE_EDGE_BOTTOM) { |
921 | container->pending.swayc_height += amount; | 921 | container->height += amount; |
922 | layout_match = container->layout == L_VERT; | 922 | layout_match = container->layout == L_VERT; |
923 | } | 923 | } |
924 | if (container->children) { | 924 | if (container->children) { |