pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

config: pass a struct with inheritable values

Browse source 
For now, font and foreground color
This commit is contained in:
Daniel Eklöf 2019-01-13 14:13:14 +01:00
parent 7776135454
commit 8dc278aaf2
20 changed files with 84 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/removables.c
View file

@ -561,7 +561,7 @@ removables_new(struct particle *label, int left_spacing, int right_spacing)
}
static struct module *
from_conf(const struct yml_node *node, const struct font *parent_font)
from_conf(const struct yml_node *node, struct conf_inherit inherited)
{
const struct yml_node *content = yml_get_value(node, "content");
const struct yml_node *spacing = yml_get_value(node, "spacing");
@ -573,8 +573,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
int right = spacing != NULL ? yml_value_as_int(spacing) :
right_spacing != NULL ? yml_value_as_int(right_spacing) : 0;
return removables_new(
conf_to_particle(content, parent_font), left, right);
return removables_new(conf_to_particle(content, inherited), left, right);
}
static bool