diff options
author | emersion <contact@emersion.fr> | 2018-08-19 09:21:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-19 09:21:55 +0100 |
commit | 2c91afbb34f649fcd4de690be5bedba4d989a7f0 (patch) | |
tree | 681f45a530a1f8d5966161291c3cb482e52edb6e /include/sway/tree | |
parent | 389d159c81502aa8b951895de11c3720bbd5ba7d (diff) | |
parent | 2b5a404ac920339a2b9ce32d4718272dee4668b9 (diff) |
Merge pull request #2487 from RyanDwyer/workspace-floating-list
Replace hacky L_FLOATING container with a list
Diffstat (limited to 'include/sway/tree')
-rw-r--r-- | include/sway/tree/container.h | 3 | ||||
-rw-r--r-- | include/sway/tree/workspace.h | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index c8410801..5eccedc1 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h @@ -40,7 +40,6 @@ enum sway_container_layout { L_VERT, L_STACKED, L_TABBED, - L_FLOATING, }; enum sway_container_border { @@ -87,7 +86,7 @@ struct sway_container_state { // Workspace properties struct sway_container *ws_fullscreen; - struct sway_container *ws_floating; + list_t *ws_floating; }; struct sway_container { diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h index c9dbb538..35c91017 100644 --- a/include/sway/tree/workspace.h +++ b/include/sway/tree/workspace.h @@ -9,7 +9,7 @@ struct sway_view; struct sway_workspace { struct sway_container *swayc; struct sway_container *fullscreen; - struct sway_container *floating; + list_t *floating; // struct sway_container list_t *output_priority; bool urgent; }; @@ -63,4 +63,7 @@ struct sway_container *workspace_find_container(struct sway_container *ws, */ struct sway_container *workspace_wrap_children(struct sway_container *ws); +void workspace_add_floating(struct sway_container *workspace, + struct sway_container *con); + #endif |