diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-08-18 09:30:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-18 09:30:13 -0400 |
| commit | 5c779c11f6fc2ca214f64b905086dead170ae174 (patch) | |
| tree | bf71a43528328a786be1a4de02781e6e83aea406 /include | |
| parent | cfe205b36fba77ba64184e0c1e8dcb211a7a8904 (diff) | |
| parent | 16c663ed49e3950388901f220066e4da69956dfb (diff) | |
Merge pull request #2481 from RyanDwyer/rename-functions
Rename container_sort_workspaces and container_wrap_children
Diffstat (limited to 'include')
| -rw-r--r-- | include/sway/output.h | 2 | ||||
| -rw-r--r-- | include/sway/tree/container.h | 8 | ||||
| -rw-r--r-- | include/sway/tree/layout.h | 2 | ||||
| -rw-r--r-- | include/sway/tree/workspace.h | 7 |
4 files changed, 9 insertions, 10 deletions
diff --git a/include/sway/output.h b/include/sway/output.h index 80dcd37b..8bdd1919 100644 --- a/include/sway/output.h +++ b/include/sway/output.h @@ -58,6 +58,8 @@ void output_damage_whole_container(struct sway_output *output, struct sway_container *output_by_name(const char *name); +void output_sort_workspaces(struct sway_container *output); + void output_enable(struct sway_output *output); bool output_has_opaque_overlay_layer_surface(struct sway_output *output); diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index fdcc31ec..d866ec03 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h @@ -361,12 +361,4 @@ bool container_is_floating_or_child(struct sway_container *container); */ bool container_is_fullscreen_or_child(struct sway_container *container); -/** - * Wrap the children of parent in a new container. The new container will be the - * only child of parent. - * - * The new container is returned. - */ -struct sway_container *container_wrap_children(struct sway_container *parent); - #endif diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h index 77cd954b..5b803dfe 100644 --- a/include/sway/tree/layout.h +++ b/include/sway/tree/layout.h @@ -45,8 +45,6 @@ void container_move(struct sway_container *container, enum sway_container_layout container_get_default_layout( struct sway_container *con); -void container_sort_workspaces(struct sway_container *output); - struct sway_container *container_get_in_direction(struct sway_container *container, struct sway_seat *seat, enum movement_direction dir); diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h index 056f2329..5b43ae87 100644 --- a/include/sway/tree/workspace.h +++ b/include/sway/tree/workspace.h @@ -50,4 +50,11 @@ struct sway_container *workspace_output_get_highest_available( void workspace_detect_urgent(struct sway_container *workspace); +/** + * Wrap the workspace's tiling children in a new container. + * The new container will be the only direct tiling child of the workspace. + * The new container is returned. + */ +struct sway_container *workspace_wrap_children(struct sway_container *ws); + #endif |