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 | |
| parent | dc361fd9df4a1b40fd4df0f7442944d51bca7760 (diff) | |
| parent | 0001b00706bfdaa185a9fd6823ff947c14aa3b5f (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'include')
| -rw-r--r-- | include/sway/config.h | 3 | ||||
| -rw-r--r-- | include/sway/output.h | 1 |
2 files changed, 3 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 { E_NONE, /**< Don't hide edge borders */ E_VERTICAL, /**< hide vertical edge borders */ E_HORIZONTAL, /**< hide horizontal edge borders */ - E_BOTH /**< hide vertical and horizontal edge borders */ + E_BOTH, /**< hide vertical and horizontal edge borders */ + E_SMART /**< hide both if precisely one window is present in workspace */ }; enum command_context { diff --git a/include/sway/output.h b/include/sway/output.h index e8afd5ed..e1bdd3f0 100644 --- a/include/sway/output.h +++ b/include/sway/output.h @@ -7,6 +7,7 @@ // Position is absolute coordinates on the edge where the adjacent output // should be searched for. swayc_t *output_by_name(const char* name, const struct wlc_point *abs_pos); +swayc_t *swayc_opposite_output(enum movement_direction dir, const struct wlc_point *abs_pos); swayc_t *swayc_adjacent_output(swayc_t *output, enum movement_direction dir, const struct wlc_point *abs_pos, bool pick_closest); // Place absolute coordinates for given container into given wlc_point. |