alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1044 from ametisf/master

Browse source 
Implement hide_edge_borders smart (like in i3 4.13)
This commit is contained in:
Drew DeVault 2017-01-12 11:39:31 -05:00 committed by GitHub
parent 307e8afde2 c04819e8c0
commit c1e6cc3257
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/sway/config.h
View file

@ -178,7 +178,8 @@ enum edge_border_types {
E_NONE, /**< Don't hide edge borders */ E_NONE, /**< Don't hide edge borders */
E_VERTICAL, /**< hide vertical edge borders */ E_VERTICAL, /**< hide vertical edge borders */
E_HORIZONTAL, /**< hide horizontal 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 { enum command_context {

2
sway/commands/hide_edge_borders.c
View file

@ -15,6 +15,8 @@ struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {
config->hide_edge_borders = E_HORIZONTAL; config->hide_edge_borders = E_HORIZONTAL;
} else if (strcasecmp(argv[0], "both") == 0) { } else if (strcasecmp(argv[0], "both") == 0) {
config->hide_edge_borders = E_BOTH; config->hide_edge_borders = E_BOTH;
} else if (strcasecmp(argv[0], "smart") == 0) {
config->hide_edge_borders = E_SMART;
} else { } else {
return cmd_results_new(CMD_INVALID, "hide_edge_borders", return cmd_results_new(CMD_INVALID, "hide_edge_borders",
"Expected 'hide_edge_borders <none|vertical|horizontal|both>'"); "Expected 'hide_edge_borders <none|vertical|horizontal|both>'");

7
sway/layout.c
View file

@ -665,6 +665,13 @@ void update_geometry(swayc_t *container) {
border_bottom = 0; border_bottom = 0;
} }
} }
if (config->hide_edge_borders == E_SMART && workspace->children->length == 1) {
border_top = 0;
border_bottom = 0;
border_left = 0;
border_right = 0;
}
} }
int title_bar_height = config->font_height + 4; //borders + padding int title_bar_height = config->font_height + 4; //borders + padding