diff options
| author | Zandr Martin <[email protected]> | 2016-09-02 13:46:19 -0500 |
|---|---|---|
| committer | Zandr Martin <[email protected]> | 2016-09-02 13:46:19 -0500 |
| commit | 79ffea328c992c5109406771a59a9f016d85970d (patch) | |
| tree | 5d965e72127f227ea0a38dc5c6e4fc14e08d9498 /sway/layout.c | |
| parent | b374c35758777f98e5ddbe4b0dc43bd7c80f36d7 (diff) | |
| parent | 4e6d7b125895955e3a84583c6d61f3eb2f8a4fe9 (diff) | |
Merge branch 'master' of git://github.com/SirCmpwn/sway into commands-refactor
Diffstat (limited to 'sway/layout.c')
| -rw-r--r-- | sway/layout.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sway/layout.c b/sway/layout.c index 01c8e4e3..7f053d9b 100644 --- a/sway/layout.c +++ b/sway/layout.c @@ -2,17 +2,17 @@ #include <stdbool.h> #include <math.h> #include <wlc/wlc.h> -#include "extensions.h" -#include "log.h" +#include "sway/extensions.h" +#include "sway/config.h" +#include "sway/container.h" +#include "sway/workspace.h" +#include "sway/focus.h" +#include "sway/output.h" +#include "sway/ipc-server.h" +#include "sway/border.h" +#include "sway/layout.h" #include "list.h" -#include "config.h" -#include "container.h" -#include "workspace.h" -#include "focus.h" -#include "output.h" -#include "ipc-server.h" -#include "border.h" -#include "layout.h" +#include "log.h" swayc_t root_container; list_t *scratchpad; @@ -575,7 +575,7 @@ void update_geometry(swayc_t *container) { // handle hide_edge_borders if (config->hide_edge_borders != E_NONE && (gap <= 0 || (config->smart_gaps && workspace->children->length == 1))) { - if (config->hide_edge_borders == E_HORIZONTAL || config->hide_edge_borders == E_BOTH) { + if (config->hide_edge_borders == E_VERTICAL || config->hide_edge_borders == E_BOTH) { if (geometry.origin.x == workspace->x) { border_left = 0; } @@ -585,7 +585,7 @@ void update_geometry(swayc_t *container) { } } - if (config->hide_edge_borders == E_VERTICAL || config->hide_edge_borders == E_BOTH) { + if (config->hide_edge_borders == E_HORIZONTAL || config->hide_edge_borders == E_BOTH) { if (geometry.origin.y == workspace->y || should_hide_top_border(container, geometry.origin.y)) { border_top = 0; } |