diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-03-01 13:24:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-01 13:24:47 -0500 |
| commit | d6ac3021ceafdf7e3a876a3764cc553f4df6b8cc (patch) | |
| tree | e90c86a30595ed7a18713a19fe9d26e8fa30a2c4 /sway/layout.c | |
| parent | 21ad45b622eb1fc2c68d1036fd9763a37fec668b (diff) | |
| parent | 032907e9d281ccfed0c881b5ae3e47dc6e8bf412 (diff) | |
| download | sway-d6ac3021ceafdf7e3a876a3764cc553f4df6b8cc.tar.xz | |
Merge pull request #1092 from 4e554c4c/move_floating
i3 feature support: Moving flotaing containers
Diffstat (limited to 'sway/layout.c')
| -rw-r--r-- | sway/layout.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/sway/layout.c b/sway/layout.c index 5e144cd8..e196ebd3 100644 --- a/sway/layout.c +++ b/sway/layout.c @@ -349,10 +349,31 @@ static void swap_children(swayc_t *container, int a, int b) { } } -void move_container(swayc_t *container, enum movement_direction dir) { +void move_container(swayc_t *container, enum movement_direction dir, int move_amt) { enum swayc_layouts layout = L_NONE; swayc_t *parent = container->parent; - if (container->is_floating || (container->type != C_VIEW && container->type != C_CONTAINER)) { + if (container->is_floating) { + swayc_t *output = swayc_parent_by_type(container, C_OUTPUT); + switch(dir) { + case MOVE_LEFT: + container->x = MAX(0, container->x - move_amt); + break; + case MOVE_RIGHT: + container->x = MIN(output->width - container->width, container->x + move_amt); + break; + case MOVE_UP: + container->y = MAX(0, container->y - move_amt); + break; + case MOVE_DOWN: + container->y = MIN(output->height - container->height, container->y + move_amt); + break; + default: + break; + } + update_geometry(container); + return; + } + if (container->type != C_VIEW && container->type != C_CONTAINER) { return; } if (dir == MOVE_UP || dir == MOVE_DOWN) { |