mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-16 13:13:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

style

Browse source
This commit is contained in:
taiyu 2015-08-28 11:14:59 -07:00
parent c9de300888
commit 28c22c8f80
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sway/commands.c
View file

@ -209,7 +209,7 @@ static bool cmd_floating(struct sway_config *config, int argc, char **argv) {
destroy_container(remove_child(view)); destroy_container(remove_child(view));
// and move it into workspace floating // and move it into workspace floating
add_floating(swayc_active_workspace(),view); add_floating(swayc_active_workspace(), view);
view->x = (swayc_active_workspace()->width - view->width)/2; view->x = (swayc_active_workspace()->width - view->width)/2;
view->y = (swayc_active_workspace()->height - view->height)/2; view->y = (swayc_active_workspace()->height - view->height)/2;
if (view->desired_width != -1) { if (view->desired_width != -1) {
@ -351,13 +351,13 @@ static bool cmd_move(struct sway_config *config, int argc, char **argv) {
swayc_t *view = get_focused_container(&root_container); swayc_t *view = get_focused_container(&root_container);
if (strcasecmp(argv[0], "left") == 0) { if (strcasecmp(argv[0], "left") == 0) {
move_container(view,MOVE_LEFT); move_container(view, MOVE_LEFT);
} else if (strcasecmp(argv[0], "right") == 0) { } else if (strcasecmp(argv[0], "right") == 0) {
move_container(view,MOVE_RIGHT); move_container(view, MOVE_RIGHT);
} else if (strcasecmp(argv[0], "up") == 0) { } else if (strcasecmp(argv[0], "up") == 0) {
move_container(view,MOVE_UP); move_container(view, MOVE_UP);
} else if (strcasecmp(argv[0], "down") == 0) { } else if (strcasecmp(argv[0], "down") == 0) {
move_container(view,MOVE_DOWN); move_container(view, MOVE_DOWN);
} else if (strcasecmp(argv[0], "container") == 0 || strcasecmp(argv[0], "window") == 0) { } else if (strcasecmp(argv[0], "container") == 0 || strcasecmp(argv[0], "window") == 0) {
// "move container to workspace x" // "move container to workspace x"
if (!checkarg(argc, "move container/window", EXPECTED_EQUAL_TO, 4) || if (!checkarg(argc, "move container/window", EXPECTED_EQUAL_TO, 4) ||
@ -389,7 +389,7 @@ static bool cmd_move(struct sway_config *config, int argc, char **argv) {
} }
static bool cmd_orientation(struct sway_config *config, int argc, char **argv) { static bool cmd_orientation(struct sway_config *config, int argc, char **argv) {
if (strcasecmp(argv[0],"horizontal") == 0) { if (strcasecmp(argv[0], "horizontal") == 0) {
config->default_orientation = L_HORIZ; config->default_orientation = L_HORIZ;
} else if (strcasecmp(argv[0], "vertical") == 0) { } else if (strcasecmp(argv[0], "vertical") == 0) {
config->default_orientation = L_VERT; config->default_orientation = L_VERT;

3
sway/layout.c
View file

@ -515,8 +515,7 @@ swayc_t *get_swayc_in_direction_under(swayc_t *container, enum movement_directio
can_move = true; can_move = true;
diff = target - self; diff = target - self;
} }
} } else {
else {
if (dir == MOVE_LEFT || dir == MOVE_RIGHT) { if (dir == MOVE_LEFT || dir == MOVE_RIGHT) {
if (parent->layout == L_HORIZ) { if (parent->layout == L_HORIZ) {
can_move = true; can_move = true;