From aee4805df88db6d11186af0147426acf0e9cc681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sat, 29 Dec 2018 17:09:57 +0100 Subject: [PATCH] particle/list: expand on_click handler before passing to exposable --- particles/list.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/particles/list.c b/particles/list.c index bbb4d4f..64db593 100644 --- a/particles/list.c +++ b/particles/list.c @@ -118,13 +118,18 @@ instantiate(const struct particle *particle, const struct tag_set *tags) e->exposables[i] = pp->instantiate(pp, tags); } - struct exposable *exposable = exposable_common_new( - particle, particle->on_click_template); + char *on_click = particle->on_click_template != NULL + ? tags_expand_template(particle->on_click_template, tags) + : NULL; + + struct exposable *exposable = exposable_common_new(particle, on_click); exposable->private = e; exposable->destroy = &exposable_destroy; exposable->begin_expose = &begin_expose; exposable->expose = &expose; exposable->on_mouse = &on_mouse; + + free(on_click); return exposable; }