diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-18 21:54:09 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-18 22:02:03 +1000 |
commit | 16c663ed49e3950388901f220066e4da69956dfb (patch) | |
tree | bf71a43528328a786be1a4de02781e6e83aea406 /sway/commands/floating.c | |
parent | Merge pull request #2480 from RyanDwyer/fix-mod-resize (diff) | |
download | sway-16c663ed49e3950388901f220066e4da69956dfb.tar.gz sway-16c663ed49e3950388901f220066e4da69956dfb.tar.zst sway-16c663ed49e3950388901f220066e4da69956dfb.zip |
Rename container_sort_workspaces and container_wrap_children
This commit renames container_sort_workspaces to output_sort_workspaces
and moves it to output.c.
This also renames container_wrap_children to workspace_wrap_children and
moves it to workspace.c. This function is only called with workspaces.
Diffstat (limited to 'sway/commands/floating.c')
-rw-r--r-- | sway/commands/floating.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sway/commands/floating.c b/sway/commands/floating.c index 31de5ec3..c9467ef0 100644 --- a/sway/commands/floating.c +++ b/sway/commands/floating.c | |||
@@ -8,6 +8,7 @@ | |||
8 | #include "sway/tree/container.h" | 8 | #include "sway/tree/container.h" |
9 | #include "sway/tree/layout.h" | 9 | #include "sway/tree/layout.h" |
10 | #include "sway/tree/view.h" | 10 | #include "sway/tree/view.h" |
11 | #include "sway/tree/workspace.h" | ||
11 | #include "list.h" | 12 | #include "list.h" |
12 | 13 | ||
13 | struct cmd_results *cmd_floating(int argc, char **argv) { | 14 | struct cmd_results *cmd_floating(int argc, char **argv) { |
@@ -24,7 +25,7 @@ struct cmd_results *cmd_floating(int argc, char **argv) { | |||
24 | if (container->type == C_WORKSPACE) { | 25 | if (container->type == C_WORKSPACE) { |
25 | // Wrap the workspace's children in a container so we can float it | 26 | // Wrap the workspace's children in a container so we can float it |
26 | struct sway_container *workspace = container; | 27 | struct sway_container *workspace = container; |
27 | container = container_wrap_children(container); | 28 | container = workspace_wrap_children(container); |
28 | workspace->layout = L_HORIZ; | 29 | workspace->layout = L_HORIZ; |
29 | seat_set_focus(config->handler_context.seat, container); | 30 | seat_set_focus(config->handler_context.seat, container); |
30 | } | 31 | } |