diff options
-rw-r--r-- | sway/commands/focus.c | 11 | ||||
-rw-r--r-- | sway/tree/container.c | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/sway/commands/focus.c b/sway/commands/focus.c index ce3d032f..76d3f1dc 100644 --- a/sway/commands/focus.c +++ b/sway/commands/focus.c | |||
@@ -35,6 +35,15 @@ static struct cmd_results *focus_mode(struct sway_container *con, | |||
35 | struct sway_seat *seat, bool floating) { | 35 | struct sway_seat *seat, bool floating) { |
36 | struct sway_container *ws = con->type == C_WORKSPACE ? | 36 | struct sway_container *ws = con->type == C_WORKSPACE ? |
37 | con : container_parent(con, C_WORKSPACE); | 37 | con : container_parent(con, C_WORKSPACE); |
38 | |||
39 | // If the container is in a floating split container, | ||
40 | // operate on the split container instead of the child. | ||
41 | if (container_is_floating_or_child(con)) { | ||
42 | while (con->parent->layout != L_FLOATING) { | ||
43 | con = con->parent; | ||
44 | } | ||
45 | } | ||
46 | |||
38 | struct sway_container *new_focus = NULL; | 47 | struct sway_container *new_focus = NULL; |
39 | if (floating) { | 48 | if (floating) { |
40 | new_focus = seat_get_focus_inactive(seat, ws->sway_workspace->floating); | 49 | new_focus = seat_get_focus_inactive(seat, ws->sway_workspace->floating); |
@@ -99,7 +108,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) { | |||
99 | } else if (strcmp(argv[0], "tiling") == 0) { | 108 | } else if (strcmp(argv[0], "tiling") == 0) { |
100 | return focus_mode(con, seat, false); | 109 | return focus_mode(con, seat, false); |
101 | } else if (strcmp(argv[0], "mode_toggle") == 0) { | 110 | } else if (strcmp(argv[0], "mode_toggle") == 0) { |
102 | return focus_mode(con, seat, !container_is_floating(con)); | 111 | return focus_mode(con, seat, !container_is_floating_or_child(con)); |
103 | } | 112 | } |
104 | 113 | ||
105 | if (strcmp(argv[0], "output") == 0) { | 114 | if (strcmp(argv[0], "output") == 0) { |
diff --git a/sway/tree/container.c b/sway/tree/container.c index b8ff87e1..71babe5c 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -1033,7 +1033,7 @@ void container_set_floating(struct sway_container *container, bool enable) { | |||
1033 | struct sway_container *sibling = | 1033 | struct sway_container *sibling = |
1034 | seat_get_focus_inactive_tiling(seat, workspace); | 1034 | seat_get_focus_inactive_tiling(seat, workspace); |
1035 | container_remove_child(container); | 1035 | container_remove_child(container); |
1036 | container_add_child(sibling, container); | 1036 | container_add_sibling(sibling, container); |
1037 | container->width = container->parent->width; | 1037 | container->width = container->parent->width; |
1038 | container->height = container->parent->height; | 1038 | container->height = container->parent->height; |
1039 | if (container->type == C_VIEW) { | 1039 | if (container->type == C_VIEW) { |