diff options
| author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-08-25 13:06:04 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-25 13:06:04 +1000 |
| commit | 4b9ad9c2382db9b2a9a224e9ebc60b6298843aa9 (patch) | |
| tree | f1ed7e866d4e34f5ef9b8f72ec8095369619aaa7 /sway/commands/resize.c | |
| parent | f51b9478f28143a4f1887711497ff131f26ab1c4 (diff) | |
| parent | e86d99acd655815781cd2e23877ce58ab5b24826 (diff) | |
Merge branch 'master' into commands
Diffstat (limited to 'sway/commands/resize.c')
| -rw-r--r-- | sway/commands/resize.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sway/commands/resize.c b/sway/commands/resize.c index 0f3005f4..ea1e36ff 100644 --- a/sway/commands/resize.c +++ b/sway/commands/resize.c @@ -5,6 +5,7 @@ #include <stdlib.h> #include <string.h> #include <strings.h> +#include <wlr/util/edges.h> #include <wlr/util/log.h> #include "sway/commands.h" #include "sway/tree/arrange.h" @@ -250,10 +251,10 @@ static void resize_tiled(struct sway_container *parent, int amount, } } - enum resize_edge minor_edge = axis == RESIZE_AXIS_HORIZONTAL ? - RESIZE_EDGE_LEFT : RESIZE_EDGE_TOP; - enum resize_edge major_edge = axis == RESIZE_AXIS_HORIZONTAL ? - RESIZE_EDGE_RIGHT : RESIZE_EDGE_BOTTOM; + enum wlr_edges minor_edge = axis == RESIZE_AXIS_HORIZONTAL ? + WLR_EDGE_LEFT : WLR_EDGE_TOP; + enum wlr_edges major_edge = axis == RESIZE_AXIS_HORIZONTAL ? + WLR_EDGE_RIGHT : WLR_EDGE_BOTTOM; for (int i = 0; i < parent->parent->children->length; i++) { struct sway_container *sibling = parent->parent->children->items[i]; |