mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 00:16:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #216 from sce/learn_edge_gaps_0

Browse source 
Learn "gaps edge_gaps <on|off|toggle>".
This commit is contained in:
Drew DeVault 2015-11-04 07:37:37 -05:00
commit c3d731ba93
5 changed files with 42 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/config.h
View file

@ -57,6 +57,7 @@ struct sway_config {
bool auto_back_and_forth;
bool seamless_mouse;
bool edge_gaps;
int gaps_inner;
int gaps_outer;
};

5
sway.5.txt
View file

@ -68,6 +68,11 @@ Commands
**fullscreen**::
Toggles fullscreen status for the focused view.
**gaps** edge_gaps <on|off|toggle>::
Whether or not to add gaps between views and workspace edges if amount of
inner gap is not zero. When _no_, no gap is added where the view is aligned to
the workspace edge, effectively creating gaps only between views.
**gaps** <amount>::
Sets default _amount_ pixels as the gap between each view, and around each
workspace.

17
sway/commands.c
View file

@ -761,7 +761,8 @@ static struct cmd_results *cmd_gaps(int argc, char **argv) {
return error;
}
const char* expected_syntax =
"Expected 'gaps <inner|outer> <current|all|workspace> <set|plus|minus n>'";
"Expected 'gaps edge_gaps <on|off|toggle>' or "
"'gaps <inner|outer> <current|all|workspace> <set|plus|minus n>'";
const char *amount_str = argv[0];
// gaps amount
if (argc >= 1 && isdigit(*amount_str)) {
@ -789,6 +790,20 @@ static struct cmd_results *cmd_gaps(int argc, char **argv) {
}
arrange_windows(&root_container, -1, -1);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} else if (argc == 2 && strcasecmp(argv[0], "edge_gaps") == 0) {
// gaps edge_gaps <on|off|toggle>
if (strcasecmp(argv[1], "toggle") == 0) {
if (config->reading) {
return cmd_results_new(CMD_FAILURE, "gaps edge_gaps toggle",
"Can't be used in config file.");
}
config->edge_gaps = !config->edge_gaps;
} else {
config->edge_gaps =
(strcasecmp(argv[1], "yes") == 0 || strcasecmp(argv[1], "on") == 0);
}
arrange_windows(&root_container, -1, -1);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}
// gaps inner|outer current|all set|plus|minus n
if (argc < 4 || config->reading) {

1
sway/config.c
View file

@ -105,6 +105,7 @@ static void config_defaults(struct sway_config *config) {
config->seamless_mouse = true;
config->reading = false;
config->edge_gaps = false;
config->gaps_inner = 0;
config->gaps_outer = 0;
}

20
sway/layout.c
View file

@ -367,9 +367,27 @@ void update_geometry(swayc_t *container) {
if (op->focused == ws) {
wlc_view_bring_to_front(container->handle);
}
} else if (!config->edge_gaps && gap > 0) {
// Remove gap against the workspace edges. Because a pixel is not
// divisable, depending on gap size and the number of siblings our view
// might be at the workspace edge without being exactly so (thus test
// with gap, and align correctly).
if (container->x - gap <= ws->x) {
geometry.origin.x = ws->x;
geometry.size.w = container->width - gap/2;
}
if (container->y - gap <= ws->y) {
geometry.origin.y = ws->y;
geometry.size.h = container->height - gap/2;
}
if (container->x + container->width + gap >= ws->x + ws->width) {
geometry.size.w = ws->width - geometry.origin.x;
}
if (container->y + container->height + gap >= ws->y + ws->height) {
geometry.size.h = ws->height - geometry.origin.y;
}
}
wlc_view_set_geometry(container->handle, 0, &geometry);
return;
}
static void arrange_windows_r(swayc_t *container, double width, double height) {