aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar taiyu <taiyu.len@gmail.com>2015-08-29 06:51:37 -0700
committerLibravatar taiyu <taiyu.len@gmail.com>2015-08-29 06:51:37 -0700
commit79da7f112a5cd228ab45af3c1ef7f4f67bff936d (patch)
tree7b1a45d2a2a3b286f70364dad6023106f5c35697
parentMerge pull request #150 from Luminarys/master (diff)
downloadsway-79da7f112a5cd228ab45af3c1ef7f4f67bff936d.tar.gz
sway-79da7f112a5cd228ab45af3c1ef7f4f67bff936d.tar.zst
sway-79da7f112a5cd228ab45af3c1ef7f4f67bff936d.zip
#151 fix
-rw-r--r--sway/layout.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sway/layout.c b/sway/layout.c
index 875115e7..daef332a 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -204,9 +204,6 @@ void swap_geometry(swayc_t *a, swayc_t *b) {
204 b->height = h; 204 b->height = h;
205} 205}
206 206
207// TODO fix workspace movement, as in
208// [a][b][c] => |move b| => [aa][cc]
209// [a][b][c] => |down | => [bbbbbb]
210void move_container(swayc_t *container, enum movement_direction dir) { 207void move_container(swayc_t *container, enum movement_direction dir) {
211 enum swayc_layouts layout; 208 enum swayc_layouts layout;
212 if (container->is_floating) { 209 if (container->is_floating) {
@@ -288,7 +285,7 @@ void move_container(swayc_t *container, enum movement_direction dir) {
288} 285}
289 286
290void move_container_to(swayc_t* container, swayc_t* destination) { 287void move_container_to(swayc_t* container, swayc_t* destination) {
291 if (container == destination && swayc_is_parent_of(container, destination)) { 288 if (container == destination || swayc_is_parent_of(container, destination)) {
292 return; 289 return;
293 } 290 }
294 swayc_t *parent = remove_child(container); 291 swayc_t *parent = remove_child(container);