[FL-976] Removing lambdas (#1849)
* Removing lambdas... * Wake the fk up, Gordon! We have a citadel to burn! * Here comes the Nihilanth * Lambda documentation Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
@@ -36,7 +36,9 @@ static bool gui_widget_view_input_callback(InputEvent* event, void* context) {
|
||||
|
||||
// Call all Widget Elements input handlers
|
||||
with_view_model(
|
||||
widget->view, (GuiWidgetModel * model) {
|
||||
widget->view,
|
||||
GuiWidgetModel * model,
|
||||
{
|
||||
ElementArray_it_t it;
|
||||
ElementArray_it(it, model->element);
|
||||
while(!ElementArray_end_p(it)) {
|
||||
@@ -46,8 +48,8 @@ static bool gui_widget_view_input_callback(InputEvent* event, void* context) {
|
||||
}
|
||||
ElementArray_next(it);
|
||||
}
|
||||
return true;
|
||||
});
|
||||
},
|
||||
true);
|
||||
|
||||
return consumed;
|
||||
}
|
||||
@@ -61,10 +63,7 @@ Widget* widget_alloc() {
|
||||
view_set_input_callback(widget->view, gui_widget_view_input_callback);
|
||||
|
||||
with_view_model(
|
||||
widget->view, (GuiWidgetModel * model) {
|
||||
ElementArray_init(model->element);
|
||||
return true;
|
||||
});
|
||||
widget->view, GuiWidgetModel * model, { ElementArray_init(model->element); }, true);
|
||||
|
||||
return widget;
|
||||
}
|
||||
@@ -73,7 +72,9 @@ void widget_reset(Widget* widget) {
|
||||
furi_assert(widget);
|
||||
|
||||
with_view_model(
|
||||
widget->view, (GuiWidgetModel * model) {
|
||||
widget->view,
|
||||
GuiWidgetModel * model,
|
||||
{
|
||||
ElementArray_it_t it;
|
||||
ElementArray_it(it, model->element);
|
||||
while(!ElementArray_end_p(it)) {
|
||||
@@ -83,8 +84,8 @@ void widget_reset(Widget* widget) {
|
||||
ElementArray_next(it);
|
||||
}
|
||||
ElementArray_reset(model->element);
|
||||
return true;
|
||||
});
|
||||
},
|
||||
true);
|
||||
}
|
||||
|
||||
void widget_free(Widget* widget) {
|
||||
@@ -93,10 +94,7 @@ void widget_free(Widget* widget) {
|
||||
widget_reset(widget);
|
||||
// Free elements container
|
||||
with_view_model(
|
||||
widget->view, (GuiWidgetModel * model) {
|
||||
ElementArray_clear(model->element);
|
||||
return true;
|
||||
});
|
||||
widget->view, GuiWidgetModel * model, { ElementArray_clear(model->element); }, true);
|
||||
|
||||
view_free(widget->view);
|
||||
free(widget);
|
||||
@@ -112,11 +110,13 @@ static void widget_add_element(Widget* widget, WidgetElement* element) {
|
||||
furi_assert(element);
|
||||
|
||||
with_view_model(
|
||||
widget->view, (GuiWidgetModel * model) {
|
||||
widget->view,
|
||||
GuiWidgetModel * model,
|
||||
{
|
||||
element->parent = widget;
|
||||
ElementArray_push_back(model->element, element);
|
||||
return true;
|
||||
});
|
||||
},
|
||||
true);
|
||||
}
|
||||
|
||||
void widget_add_string_multiline_element(
|
||||
|
Reference in New Issue
Block a user