From 762f04938914dfc38094f21e53e2d91b374176e1 Mon Sep 17 00:00:00 2001 From: Erik Reider Date: Sat, 22 Apr 2023 13:29:04 +0200 Subject: [PATCH] Renamed corner_radius bool to corner_rounding --- include/sway/config.h | 2 +- sway/commands/layer_effects.c | 6 +++--- sway/desktop/output.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/sway/config.h b/include/sway/config.h index 66263e1b..b49f735d 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -479,7 +479,7 @@ struct layer_effects { char *namespace; bool blur; bool shadow; - bool corner_radius; + bool corner_rounding; }; /** diff --git a/sway/commands/layer_effects.c b/sway/commands/layer_effects.c index fefcd420..acb52541 100644 --- a/sway/commands/layer_effects.c +++ b/sway/commands/layer_effects.c @@ -15,7 +15,7 @@ struct cmd_results *cmd_layer_effects(int argc, char **argv) { memcpy(effect->namespace, argv[0], len); effect->blur = false; effect->shadow = false; - effect->corner_radius = false; + effect->corner_rounding = false; // Parse the commands for (int i = 1; i < argc; i++) { @@ -27,13 +27,13 @@ struct cmd_results *cmd_layer_effects(int argc, char **argv) { effect->shadow = true; continue; } else if (strcmp(arg, "corner_rounding") == 0) { - effect->corner_radius = true; + effect->corner_rounding = true; continue; } return cmd_results_new(CMD_INVALID, "Invalid layer_effects effect! Got \"%s\"", arg); } - if (!effect->blur && !effect->shadow && !effect->corner_radius) { + if (!effect->blur && !effect->shadow && !effect->corner_rounding) { return cmd_results_new(CMD_SUCCESS, NULL); } diff --git a/sway/desktop/output.c b/sway/desktop/output.c index b35b5091..8074630e 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -204,7 +204,7 @@ void output_layer_for_each_toplevel_surface(struct sway_output *output, if (effects) { data->deco_data.blur = effects->blur && config->blur_enabled; data->deco_data.shadow = effects->shadow && config->shadow_enabled; - data->deco_data.corner_radius = effects->corner_radius? config->corner_radius: 0; + data->deco_data.corner_radius = effects->corner_rounding? config->corner_radius: 0; } output_surface_for_each_surface(output, wlr_layer_surface_v1->surface,