diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-04-05 23:26:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-05 23:26:40 -0400 |
commit | 9acd066be494277a7d0fe6f2660619c4225fef7f (patch) | |
tree | 423ceecd24af024e8d708a35a3f3a7baa5a04a42 | |
parent | Remove wlc-git from .build.yml (diff) | |
parent | Remove L_TYPES (diff) | |
download | sway-9acd066be494277a7d0fe6f2660619c4225fef7f.tar.gz sway-9acd066be494277a7d0fe6f2660619c4225fef7f.tar.zst sway-9acd066be494277a7d0fe6f2660619c4225fef7f.zip |
Merge pull request #1751 from emersion/remove-layout-last
Remove L_TYPES
-rw-r--r-- | include/sway/tree/container.h | 4 | ||||
-rw-r--r-- | sway/ipc-json.c | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 7acb607b..4c60530f 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
@@ -24,6 +24,7 @@ enum sway_container_type { | |||
24 | C_CONTAINER, | 24 | C_CONTAINER, |
25 | C_VIEW, | 25 | C_VIEW, |
26 | 26 | ||
27 | // Keep last | ||
27 | C_TYPES, | 28 | C_TYPES, |
28 | }; | 29 | }; |
29 | 30 | ||
@@ -34,9 +35,6 @@ enum sway_container_layout { | |||
34 | L_STACKED, | 35 | L_STACKED, |
35 | L_TABBED, | 36 | L_TABBED, |
36 | L_FLOATING, | 37 | L_FLOATING, |
37 | |||
38 | // Keep last | ||
39 | L_LAYOUTS, | ||
40 | }; | 38 | }; |
41 | 39 | ||
42 | enum sway_container_border { | 40 | enum sway_container_border { |
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 2c7c7325..f9c6c90b 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c | |||
@@ -24,7 +24,6 @@ static const char *ipc_json_layout_description(enum sway_container_layout l) { | |||
24 | case L_FLOATING: | 24 | case L_FLOATING: |
25 | return "floating"; | 25 | return "floating"; |
26 | case L_NONE: | 26 | case L_NONE: |
27 | case L_LAYOUTS: | ||
28 | break; | 27 | break; |
29 | } | 28 | } |
30 | return "none"; | 29 | return "none"; |