liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lib: update m-lib to latest release. Update m-lib usage across project. (#818)

Browse Source
This commit is contained in:
あく
2021-11-15 20:09:40 +03:00
committed by GitHub
parent b2356c7318
commit 2e46ec36a7
25 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/gui/modules/button_menu.c
View File

@@ -246,7 +246,7 @@ void button_menu_clean(ButtonMenu* button_menu) {
with_view_model(
button_menu->view, (ButtonMenuModel * model) {
ButtonMenuItemArray_clean(model->items);
ButtonMenuItemArray_reset(model->items);
model->position = 0;
return true;
});

8
applications/gui/modules/button_panel.c
View File

@@ -139,8 +139,8 @@ void button_panel_clean(ButtonPanel* button_panel) {
}
model->reserve_x = 0;
model->reserve_y = 0;
LabelList_clean(model->labels);
ButtonMatrix_clean(model->button_matrix);
LabelList_reset(model->labels);
ButtonMatrix_reset(model->button_matrix);
return true;
});
}
@@ -150,8 +150,8 @@ static ButtonItem** button_panel_get_item(ButtonPanelModel* model, size_t x, siz
furi_check(x < model->reserve_x);
furi_check(y < model->reserve_y);
ButtonArray_t* button_array = ButtonMatrix_get_at(model->button_matrix, x);
ButtonItem** button_item = ButtonArray_get_at(*button_array, y);
ButtonArray_t* button_array = ButtonMatrix_safe_get(model->button_matrix, x);
ButtonItem** button_item = ButtonArray_safe_get(*button_array, y);
return button_item;
}

2
applications/gui/modules/menu.c
View File

@@ -178,7 +178,7 @@ void menu_clean(Menu* menu) {
furi_assert(menu);
with_view_model(
menu->view, (MenuModel * model) {
MenuItemArray_clean(model->items);
MenuItemArray_reset(model->items);
model->position = 0;
return true;
});

2
applications/gui/modules/submenu.c
View File

@@ -174,7 +174,7 @@ void submenu_clean(Submenu* submenu) {
with_view_model(
submenu->view, (SubmenuModel * model) {
SubmenuItemArray_clean(model->items);
SubmenuItemArray_reset(model->items);
model->position = 0;
model->window_position = 0;
model->header = NULL;

2
applications/gui/modules/variable-item-list.c
View File

@@ -295,7 +295,7 @@ void variable_item_list_clean(VariableItemList* variable_item_list) {
VariableItemArray_next(it)) {
string_clear(VariableItemArray_ref(it)->current_value_text);
}
VariableItemArray_clean(model->items);
VariableItemArray_reset(model->items);
return false;
});
}

2
applications/gui/modules/widget.c
View File

@@ -81,7 +81,7 @@ void widget_clear(Widget* widget) {
element->free(element);
ElementArray_next(it);
}
ElementArray_clean(model->element);
ElementArray_reset(model->element);
return true;
});
}