diff options
| author |  willakat <willakat@users.noreply.github.com> | 2017-01-14 19:40:02 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-01-14 19:40:02 +0100 |
| commit | 4c06a100046db6f8756e245c351eb9420a272f93 (patch) | |
| tree | 51350f88fb37fea4c94c5787d0df32a3eb102ab1 /include/sway/config.h | |
| parent | Merge branch 'master' into master (diff) | |
| parent | Merge pull request #1048 from dkess/proper-output-wrapping (diff) | |
| download | sway-4c06a100046db6f8756e245c351eb9420a272f93.tar.gz sway-4c06a100046db6f8756e245c351eb9420a272f93.tar.zst sway-4c06a100046db6f8756e245c351eb9420a272f93.zip | |
Merge branch 'master' into master
Diffstat (limited to 'include/sway/config.h')
| -rw-r--r-- | include/sway/config.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index 4a14cd36..febde63d 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
| @@ -178,7 +178,8 @@ enum edge_border_types { | |||
| 178 | E_NONE, /**< Don't hide edge borders */ | 178 | E_NONE, /**< Don't hide edge borders */ |
| 179 | E_VERTICAL, /**< hide vertical edge borders */ | 179 | E_VERTICAL, /**< hide vertical edge borders */ |
| 180 | E_HORIZONTAL, /**< hide horizontal edge borders */ | 180 | E_HORIZONTAL, /**< hide horizontal edge borders */ |
| 181 | E_BOTH /**< hide vertical and horizontal edge borders */ | 181 | E_BOTH, /**< hide vertical and horizontal edge borders */ |
| 182 | E_SMART /**< hide both if precisely one window is present in workspace */ | ||
| 182 | }; | 183 | }; |
| 183 | 184 | ||
| 184 | enum command_context { | 185 | enum command_context { |