mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-01-30 20:56:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add bounded_minus option to subtract from gaps without going below 0

Browse source 
Negative gaps doesn't have any visual issues anymore, but when using keybinds to change gaps it can be confusing when you accidentally bring the gaps below 0 and then adding doesn't do anything until you bring it back above 0.

If there's a way to extract gaps information I missed, this could probably be done with a script instead
This commit is contained in:
Jason Penilla 2023-02-23 08:58:28 -07:00
parent 9498e4d261
commit 1092f49747
No known key found for this signature in database
GPG key ID: 0E75A301420E48F8
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sway/commands/gaps.c
View file

@ -12,6 +12,7 @@ enum gaps_op {
GAPS_OP_SET,
GAPS_OP_ADD,
GAPS_OP_SUBTRACT,
GAPS_OP_BOUNDED_SUBTRACT,
GAPS_OP_TOGGLE
};
@ -103,6 +104,13 @@ static void apply_gaps_op(int *prop, enum gaps_op op, int amount) {
case GAPS_OP_SUBTRACT:
*prop -= amount;
break;
case GAPS_OP_BOUNDED_SUBTRACT:
if (amount <= *prop) {
*prop -= amount;
} else {
*prop = 0;
}
break;
case GAPS_OP_TOGGLE:
*prop = *prop ? 0 : amount;
break;
@ -137,9 +145,9 @@ static void configure_gaps(struct sway_workspace *ws, void *_data) {
}
// gaps inner|outer|horizontal|vertical|top|right|bottom|left current|all
// set|plus|minus|toggle <px>
// set|plus|minus|bounded_minus|toggle <px>
static const char expected_runtime[] = "'gaps inner|outer|horizontal|vertical|"
"top|right|bottom|left current|all set|plus|minus|toggle <px>'";
"top|right|bottom|left current|all set|plus|minus|bounded_minus|toggle <px>'";
static struct cmd_results *gaps_set_runtime(int argc, char **argv) {
struct cmd_results *error = checkarg(argc, "gaps", EXPECTED_EQUAL_TO, 4);
if (error) {
@ -184,6 +192,8 @@ static struct cmd_results *gaps_set_runtime(int argc, char **argv) {
data.operation = GAPS_OP_ADD;
} else if (strcasecmp(argv[2], "minus") == 0) {
data.operation = GAPS_OP_SUBTRACT;
} else if (strcasecmp(argv[2], "bounded_minus") == 0) {
data.operation = GAPS_OP_BOUNDED_SUBTRACT;
} else if (strcasecmp(argv[2], "toggle") == 0) {
data.operation = GAPS_OP_TOGGLE;
} else {
@ -206,7 +216,7 @@ static struct cmd_results *gaps_set_runtime(int argc, char **argv) {
}
// gaps inner|outer|<dir>|<side> <px> - sets defaults for workspaces
// gaps inner|outer|<dir>|<side> current|all set|plus|minus|toggle <px> - runtime only
// gaps inner|outer|<dir>|<side> current|all set|plus|minus|bounded_minus|toggle <px> - runtime only
// <dir> = horizontal|vertical
// <side> = top|right|bottom|left
struct cmd_results *cmd_gaps(int argc, char **argv) {