diff options
author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-11-08 22:41:14 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-08 22:41:14 +1000 |
commit | aad2f444f0bfc1cd7057bf55c9249dc36680af15 (patch) | |
tree | 843a3d538ae4176884b43f111b6330a4935496e3 /include | |
parent | Merge pull request #3086 from RedSoxFan/fix-dup-inner-gaps (diff) | |
parent | Implement per side and per direction outer gaps (diff) | |
download | sway-aad2f444f0bfc1cd7057bf55c9249dc36680af15.tar.gz sway-aad2f444f0bfc1cd7057bf55c9249dc36680af15.tar.zst sway-aad2f444f0bfc1cd7057bf55c9249dc36680af15.zip |
Merge pull request #3087 from RedSoxFan/side-gaps
Implement per side and per direction outer gaps
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/config.h | 14 | ||||
-rw-r--r-- | include/sway/tree/workspace.h | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index 0912bc73..cd56c3dc 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -168,6 +168,16 @@ struct output_config { | |||
168 | }; | 168 | }; |
169 | 169 | ||
170 | /** | 170 | /** |
171 | * Stores size of gaps for each side | ||
172 | */ | ||
173 | struct side_gaps { | ||
174 | int top; | ||
175 | int right; | ||
176 | int bottom; | ||
177 | int left; | ||
178 | }; | ||
179 | |||
180 | /** | ||
171 | * Stores configuration for a workspace, regardless of whether the workspace | 181 | * Stores configuration for a workspace, regardless of whether the workspace |
172 | * exists. | 182 | * exists. |
173 | */ | 183 | */ |
@@ -175,7 +185,7 @@ struct workspace_config { | |||
175 | char *workspace; | 185 | char *workspace; |
176 | char *output; | 186 | char *output; |
177 | int gaps_inner; | 187 | int gaps_inner; |
178 | int gaps_outer; | 188 | struct side_gaps gaps_outer; |
179 | }; | 189 | }; |
180 | 190 | ||
181 | struct bar_config { | 191 | struct bar_config { |
@@ -398,7 +408,7 @@ struct sway_config { | |||
398 | 408 | ||
399 | bool smart_gaps; | 409 | bool smart_gaps; |
400 | int gaps_inner; | 410 | int gaps_inner; |
401 | int gaps_outer; | 411 | struct side_gaps gaps_outer; |
402 | 412 | ||
403 | list_t *config_chain; | 413 | list_t *config_chain; |
404 | const char *current_config_path; | 414 | const char *current_config_path; |
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h index b5ae92f3..7abfbff1 100644 --- a/include/sway/tree/workspace.h +++ b/include/sway/tree/workspace.h | |||
@@ -32,9 +32,9 @@ struct sway_workspace { | |||
32 | enum sway_container_layout layout; | 32 | enum sway_container_layout layout; |
33 | enum sway_container_layout prev_split_layout; | 33 | enum sway_container_layout prev_split_layout; |
34 | 34 | ||
35 | int current_gaps; | 35 | struct side_gaps current_gaps; |
36 | int gaps_inner; | 36 | int gaps_inner; |
37 | int gaps_outer; | 37 | struct side_gaps gaps_outer; |
38 | 38 | ||
39 | struct sway_output *output; // NULL if no outputs are connected | 39 | struct sway_output *output; // NULL if no outputs are connected |
40 | list_t *floating; // struct sway_container | 40 | list_t *floating; // struct sway_container |