diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-01-12 11:39:31 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-12 11:39:31 -0500 |
commit | c1e6cc3257e5f37438e661427d625168a76ecc27 (patch) | |
tree | 29103307c7df0ae02849e937bce8045a9e24c697 /sway | |
parent | Merge pull request #1043 from Hummer12007/caps (diff) | |
parent | Implement hide_edge_borders smart (like in i3 4.13) (diff) | |
download | sway-c1e6cc3257e5f37438e661427d625168a76ecc27.tar.gz sway-c1e6cc3257e5f37438e661427d625168a76ecc27.tar.zst sway-c1e6cc3257e5f37438e661427d625168a76ecc27.zip |
Merge pull request #1044 from ametisf/master
Implement hide_edge_borders smart (like in i3 4.13)
Diffstat (limited to 'sway')
-rw-r--r-- | sway/commands/hide_edge_borders.c | 2 | ||||
-rw-r--r-- | sway/layout.c | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sway/commands/hide_edge_borders.c b/sway/commands/hide_edge_borders.c index 0be940c1..cb4f052d 100644 --- a/sway/commands/hide_edge_borders.c +++ b/sway/commands/hide_edge_borders.c | |||
@@ -15,6 +15,8 @@ struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) { | |||
15 | config->hide_edge_borders = E_HORIZONTAL; | 15 | config->hide_edge_borders = E_HORIZONTAL; |
16 | } else if (strcasecmp(argv[0], "both") == 0) { | 16 | } else if (strcasecmp(argv[0], "both") == 0) { |
17 | config->hide_edge_borders = E_BOTH; | 17 | config->hide_edge_borders = E_BOTH; |
18 | } else if (strcasecmp(argv[0], "smart") == 0) { | ||
19 | config->hide_edge_borders = E_SMART; | ||
18 | } else { | 20 | } else { |
19 | return cmd_results_new(CMD_INVALID, "hide_edge_borders", | 21 | return cmd_results_new(CMD_INVALID, "hide_edge_borders", |
20 | "Expected 'hide_edge_borders <none|vertical|horizontal|both>'"); | 22 | "Expected 'hide_edge_borders <none|vertical|horizontal|both>'"); |
diff --git a/sway/layout.c b/sway/layout.c index ea4a680d..bb37a360 100644 --- a/sway/layout.c +++ b/sway/layout.c | |||
@@ -665,6 +665,13 @@ void update_geometry(swayc_t *container) { | |||
665 | border_bottom = 0; | 665 | border_bottom = 0; |
666 | } | 666 | } |
667 | } | 667 | } |
668 | |||
669 | if (config->hide_edge_borders == E_SMART && workspace->children->length == 1) { | ||
670 | border_top = 0; | ||
671 | border_bottom = 0; | ||
672 | border_left = 0; | ||
673 | border_right = 0; | ||
674 | } | ||
668 | } | 675 | } |
669 | 676 | ||
670 | int title_bar_height = config->font_height + 4; //borders + padding | 677 | int title_bar_height = config->font_height + 4; //borders + padding |