mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-08 13:29:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle border options for gaps

Browse source 
Fixes `hide_edge_borders smart` when gaps are in use.
Implements `hide_edge_borders smart_no_gaps` and `smart_borders
on|no_gaps|off`.

Since `smart_borders on` is equivalent to `hide_edge_borders smart`
and `smart_borders no_gaps` is equivalent to `hide_edge_borders
smart_no_gaps`, I opted to just save the last value set for
`hide_edge_borders` and restore that on `smart_borders off`. This
simplifies the conditions for setting the border.
This commit is contained in:
Brian Ashworth 2018-10-01 12:56:27 -04:00
parent b542c5413e
commit bb25194844
9 changed files with 68 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sway/commands/hide_edge_borders.c
View file

@ -1,15 +1,8 @@
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/tree/container.h"
#include "sway/tree/root.h"
#include "sway/tree/arrange.h"
#include "sway/tree/view.h"
static void _configure_view(struct sway_container *con, void *data) {
if (con->view) {
view_autoconfigure(con->view);
}
}
struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "hide_edge_borders", EXPECTED_EQUAL_TO, 1))) {
@ -26,13 +19,16 @@ struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {
config->hide_edge_borders = E_BOTH;
} else if (strcmp(argv[0], "smart") == 0) {
config->hide_edge_borders = E_SMART;
} else if (strcmp(argv[0], "smart_no_gaps") == 0) {
config->hide_edge_borders = E_SMART_NO_GAPS;
} else {
return cmd_results_new(CMD_INVALID, "hide_edge_borders",
"Expected 'hide_edge_borders "
"<none|vertical|horizontal|both|smart>'");
"<none|vertical|horizontal|both|smart|smart_no_gaps>'");
}
config->saved_edge_borders = config->hide_edge_borders;
root_for_each_container(_configure_view, NULL);
arrange_root();
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}

25
sway/commands/smart_borders.c Normal file
View file

@ -0,0 +1,25 @@
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/tree/arrange.h"
#include "sway/tree/view.h"
#include "util.h"
struct cmd_results *cmd_smart_borders(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "smart_borders", EXPECTED_EQUAL_TO, 1))) {
return error;
}
enum edge_border_types saved = config->hide_edge_borders;
if (strcmp(argv[0], "no_gaps") == 0) {
config->hide_edge_borders = E_SMART_NO_GAPS;
} else {
config->hide_edge_borders = parse_boolean(argv[0], true) ?
E_SMART : config->saved_edge_borders;
}
config->saved_edge_borders = saved;
arrange_root();
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}