Skip to content

Commit 0ba5ed1

Browse files
author
Jamie C. Driver
committed
consistency gui: remove unnecessary parameter
As per 0229193
1 parent 6aa20a0 commit 0ba5ed1

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

main/gui.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -590,11 +590,10 @@ static void push_selectable(gui_activity_t* activity, gui_view_node_t* node, uin
590590
}
591591
}
592592

593-
static void push_updatable(
594-
gui_activity_t* activity, gui_view_node_t* node, gui_updatable_callback_t callback, void* extra_args)
593+
static void push_updatable(gui_view_node_t* node, gui_updatable_callback_t callback, void* extra_args)
595594
{
596-
JADE_ASSERT(activity);
597595
JADE_ASSERT(node);
596+
JADE_ASSERT(node->activity);
598597

599598
// allocate & fill all the fields
600599
updatable_t* us = JADE_CALLOC(1, sizeof(updatable_t));
@@ -605,6 +604,7 @@ static void push_updatable(
605604
us->extra_args = extra_args;
606605

607606
// first one!
607+
gui_activity_t* const activity = node->activity;
608608
if (!activity->updatables) {
609609
activity->updatables = us;
610610
} else {
@@ -1179,7 +1179,7 @@ void gui_set_icon_animation(gui_view_node_t* node, Icon* icons, const size_t num
11791179
// If there are multiple icons, push this to the list of updatable elements so
11801180
// that the image gets periodically updated.
11811181
if (num_icons > 1) {
1182-
push_updatable(node->activity, node, icon_animation_frame_callback, NULL);
1182+
push_updatable(node, icon_animation_frame_callback, NULL);
11831183
}
11841184
}
11851185

@@ -1518,7 +1518,7 @@ void gui_set_text_scroll(gui_view_node_t* node, color_t background_color)
15181518
node->text->scroll = scroll_data;
15191519

15201520
// now push this to the list of updatable elements so that it gets updated every frame
1521-
push_updatable(node->activity, node, text_scroll_frame_callback, NULL);
1521+
push_updatable(node, text_scroll_frame_callback, NULL);
15221522
}
15231523

15241524
void gui_set_text_scroll_selected(

0 commit comments

Comments
 (0)