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 | |
parent | Merge pull request #2453 from ianyfan/commands (diff) | |
parent | Replace hacky L_FLOATING container with a list (diff) | |
download | sway-2c91afbb34f649fcd4de690be5bedba4d989a7f0.tar.gz sway-2c91afbb34f649fcd4de690be5bedba4d989a7f0.tar.zst sway-2c91afbb34f649fcd4de690be5bedba4d989a7f0.zip |
Merge pull request #2487 from RyanDwyer/workspace-floating-list
Replace hacky L_FLOATING container with a list
Diffstat (limited to 'include')
-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 { | |||
40 | L_VERT, | 40 | L_VERT, |
41 | L_STACKED, | 41 | L_STACKED, |
42 | L_TABBED, | 42 | L_TABBED, |
43 | L_FLOATING, | ||
44 | }; | 43 | }; |
45 | 44 | ||
46 | enum sway_container_border { | 45 | enum sway_container_border { |
@@ -87,7 +86,7 @@ struct sway_container_state { | |||
87 | 86 | ||
88 | // Workspace properties | 87 | // Workspace properties |
89 | struct sway_container *ws_fullscreen; | 88 | struct sway_container *ws_fullscreen; |
90 | struct sway_container *ws_floating; | 89 | list_t *ws_floating; |
91 | }; | 90 | }; |
92 | 91 | ||
93 | struct sway_container { | 92 | 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; | |||
9 | struct sway_workspace { | 9 | struct sway_workspace { |
10 | struct sway_container *swayc; | 10 | struct sway_container *swayc; |
11 | struct sway_container *fullscreen; | 11 | struct sway_container *fullscreen; |
12 | struct sway_container *floating; | 12 | list_t *floating; // struct sway_container |
13 | list_t *output_priority; | 13 | list_t *output_priority; |
14 | bool urgent; | 14 | bool urgent; |
15 | }; | 15 | }; |
@@ -63,4 +63,7 @@ struct sway_container *workspace_find_container(struct sway_container *ws, | |||
63 | */ | 63 | */ |
64 | struct sway_container *workspace_wrap_children(struct sway_container *ws); | 64 | struct sway_container *workspace_wrap_children(struct sway_container *ws); |
65 | 65 | ||
66 | void workspace_add_floating(struct sway_container *workspace, | ||
67 | struct sway_container *con); | ||
68 | |||
66 | #endif | 69 | #endif |