diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/src/gui.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/gui/src/gui.c b/src/gui/src/gui.c index e8bd4d7..9b79083 100644 --- a/src/gui/src/gui.c +++ b/src/gui/src/gui.c @@ -155,14 +155,13 @@ void gui_add_child(struct gui_common *const p, int gui_update(struct gui_common *const g, const union peripheral *const p, const struct camera *const c, struct input *const in) { - if (g->child && gui_update(g->child, p, c, in)) - return -1; - - if (g->cb && g->cb->update && g->cb->update(g, p, c, in)) + if ((g->child && gui_update(g->child, p, c, in)) + || (g->cb && g->cb->update && g->cb->update(g, p, c, in))) return -1; for (struct gui_common *s = g->sibling; s; s = s->sibling) - if (gui_update(s, p, c, in)) + if ((s->child && gui_update(s->child, p, c, in)) + || (s->cb && s->cb->update && s->cb->update(s, p, c, in))) return -1; return 0; @@ -170,14 +169,13 @@ int gui_update(struct gui_common *const g, const union peripheral *const p, int gui_render(const struct gui_common *const g) { - if (g->cb && g->cb->render && g->cb->render(g)) - return -1; - - if (g->child && gui_render(g->child)) + if ((g->cb && g->cb->render && g->cb->render(g)) + || (g->child && gui_render(g->child))) return -1; for (struct gui_common *s = g->sibling; s; s = s->sibling) - if (gui_render(s)) + if ((s->cb && s->cb->render && s->cb->render(s)) + || (s->child && gui_render(s->child))) return -1; return 0; @@ -192,5 +190,11 @@ void gui_deinit(struct gui_common *const g, struct input *const in) gui_deinit(g->child, in); for (struct gui_common *s = g->sibling; s; s = s->sibling) - gui_deinit(s, in); + { + if (s->cb && s->cb->deinit) + s->cb->deinit(s, in); + + if (s->child) + gui_deinit(s->child, in); + } } |