From 307a1f5ec841eeebda9a6b08a73606e47132fd49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sun, 13 Jan 2019 11:16:52 +0100 Subject: [PATCH] particles: all particles can have a decoration --- particle.h | 3 ++- particles/string.c | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/particle.h b/particle.h index 5b8644d..a3fcf8c 100644 --- a/particle.h +++ b/particle.h @@ -22,12 +22,13 @@ struct particle_info { size_t attr_count; /* TODO: reomve, NULL-terminate attr list instead */ const struct attr_info attrs[]; -#define PARTICLE_COMMON_ATTRS_COUNT 4 +#define PARTICLE_COMMON_ATTRS_COUNT 5 #define PARTICLE_COMMON_ATTRS \ {"margin", false, &conf_verify_int}, \ {"left-margin", false, &conf_verify_int}, \ {"right-margin", false, &conf_verify_int}, \ {"on-click", false, &conf_verify_string}, \ + {"deco", false, &conf_verify_decoration}, \ {NULL, false, NULL} }; diff --git a/particles/string.c b/particles/string.c index eef9d6b..d47fb93 100644 --- a/particles/string.c +++ b/particles/string.c @@ -173,13 +173,12 @@ from_conf(const struct yml_node *node, const struct font *parent_font, const struct particle_info plugin_info = { .from_conf = &from_conf, - .attr_count = PARTICLE_COMMON_ATTRS_COUNT + 5, + .attr_count = PARTICLE_COMMON_ATTRS_COUNT + 4, .attrs = { {"text", true, &conf_verify_string}, {"max", false, &conf_verify_int}, {"font", false, &conf_verify_font}, {"foreground", false, &conf_verify_color}, - {"deco", false, &conf_verify_decoration}, PARTICLE_COMMON_ATTRS, }, };