diff options
| -rw-r--r-- | sway/commands.c | 8 | ||||
| -rw-r--r-- | sway/layout.c | 14 |
2 files changed, 10 insertions, 12 deletions
diff --git a/sway/commands.c b/sway/commands.c index 5d79104f..af4cd56f 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -206,7 +206,7 @@ static bool cmd_floating(struct sway_config *config, int argc, char **argv) { if (!view->is_floating) { // Remove view from its current location destroy_container(remove_child(view)); - + // and move it into workspace floating add_floating(active_workspace,view); view->x = (active_workspace->width - view->width)/2; @@ -356,11 +356,9 @@ static bool cmd_move(struct sway_config *config, int argc, char **argv) { move_container(view,&root_container,MOVE_UP); } else if (strcasecmp(argv[0], "down") == 0) { move_container(view,&root_container,MOVE_DOWN); - } else - { + } else { return false; } - return true; } @@ -606,7 +604,7 @@ static struct cmd_handler handlers[] = { { "kill", cmd_kill }, { "layout", cmd_layout }, { "log_colors", cmd_log_colors }, - { "move",cmd_move}, + { "move", cmd_move}, { "reload", cmd_reload }, { "set", cmd_set }, { "split", cmd_split }, diff --git a/sway/layout.c b/sway/layout.c index 0c1f736d..a7536727 100644 --- a/sway/layout.c +++ b/sway/layout.c @@ -118,34 +118,34 @@ void move_container(swayc_t *container,swayc_t* root,enum movement_direction dir //Rearrange for (i = 0; i < clength; ++i) { swayc_t *child = root->children->items[i]; - if(child->handle == container->handle){ - if(clength == 1){ + if (child->handle == container->handle){ + if (clength == 1){ //Only one container, meh. break; } - if(direction == MOVE_LEFT && i > 0){ + if (direction == MOVE_LEFT && i > 0){ temp = root->children->items[i-1]; root->children->items[i] = temp; root->children->items[i-1] = container; arrange_windows(&root_container,-1,-1); } - else if(direction == MOVE_RIGHT && i < clength-1){ + else if (direction == MOVE_RIGHT && i < clength-1){ temp = root->children->items[i+1]; root->children->items[i] = temp; root->children->items[i+1] = container; arrange_windows(&root_container,-1,-1); } - else if(direction == MOVE_UP){ + else if (direction == MOVE_UP){ sway_log(L_INFO, "Moving up not implemented"); } - else if(direction == MOVE_DOWN){ + else if (direction == MOVE_DOWN){ sway_log(L_INFO, "Moving down not implemented"); } break; } - else if(child->children != NULL){ + else if (child->children != NULL){ move_container(container,child,direction); } } |