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 | Merge pull request #2480 from RyanDwyer/fix-mod-resize (diff) | |
parent | Rename container_sort_workspaces and container_wrap_children (diff) | |
download | sway-5c779c11f6fc2ca214f64b905086dead170ae174.tar.gz sway-5c779c11f6fc2ca214f64b905086dead170ae174.tar.zst sway-5c779c11f6fc2ca214f64b905086dead170ae174.zip |
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, | |||
58 | 58 | ||
59 | struct sway_container *output_by_name(const char *name); | 59 | struct sway_container *output_by_name(const char *name); |
60 | 60 | ||
61 | void output_sort_workspaces(struct sway_container *output); | ||
62 | |||
61 | void output_enable(struct sway_output *output); | 63 | void output_enable(struct sway_output *output); |
62 | 64 | ||
63 | bool output_has_opaque_overlay_layer_surface(struct sway_output *output); | 65 | 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); | |||
361 | */ | 361 | */ |
362 | bool container_is_fullscreen_or_child(struct sway_container *container); | 362 | bool container_is_fullscreen_or_child(struct sway_container *container); |
363 | 363 | ||
364 | /** | ||
365 | * Wrap the children of parent in a new container. The new container will be the | ||
366 | * only child of parent. | ||
367 | * | ||
368 | * The new container is returned. | ||
369 | */ | ||
370 | struct sway_container *container_wrap_children(struct sway_container *parent); | ||
371 | |||
372 | #endif | 364 | #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, | |||
45 | enum sway_container_layout container_get_default_layout( | 45 | enum sway_container_layout container_get_default_layout( |
46 | struct sway_container *con); | 46 | struct sway_container *con); |
47 | 47 | ||
48 | void container_sort_workspaces(struct sway_container *output); | ||
49 | |||
50 | struct sway_container *container_get_in_direction(struct sway_container | 48 | struct sway_container *container_get_in_direction(struct sway_container |
51 | *container, struct sway_seat *seat, enum movement_direction dir); | 49 | *container, struct sway_seat *seat, enum movement_direction dir); |
52 | 50 | ||
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( | |||
50 | 50 | ||
51 | void workspace_detect_urgent(struct sway_container *workspace); | 51 | void workspace_detect_urgent(struct sway_container *workspace); |
52 | 52 | ||
53 | /** | ||
54 | * Wrap the workspace's tiling children in a new container. | ||
55 | * The new container will be the only direct tiling child of the workspace. | ||
56 | * The new container is returned. | ||
57 | */ | ||
58 | struct sway_container *workspace_wrap_children(struct sway_container *ws); | ||
59 | |||
53 | #endif | 60 | #endif |