mirror of
https://github.com/DarkFlippers/unleashed-firmware.git
synced 2025-12-12 20:49:49 +04:00
fix merge issues
This commit is contained in:
@@ -338,26 +338,6 @@ void submenu_change_item_label(Submenu* submenu, uint32_t index, const char* lab
|
|||||||
true);
|
true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void submenu_change_item_label(Submenu* submenu, uint32_t index, const char* label) {
|
|
||||||
furi_check(submenu);
|
|
||||||
furi_check(label);
|
|
||||||
|
|
||||||
with_view_model(
|
|
||||||
submenu->view,
|
|
||||||
SubmenuModel * model,
|
|
||||||
{
|
|
||||||
SubmenuItemArray_it_t it;
|
|
||||||
for(SubmenuItemArray_it(it, model->items); !SubmenuItemArray_end_p(it);
|
|
||||||
SubmenuItemArray_next(it)) {
|
|
||||||
if(index == SubmenuItemArray_cref(it)->index) {
|
|
||||||
furi_string_set_str(SubmenuItemArray_cref(it)->label, label);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
true);
|
|
||||||
}
|
|
||||||
|
|
||||||
void submenu_reset(Submenu* submenu) {
|
void submenu_reset(Submenu* submenu) {
|
||||||
furi_check(submenu);
|
furi_check(submenu);
|
||||||
view_set_orientation(submenu->view, ViewOrientationHorizontal);
|
view_set_orientation(submenu->view, ViewOrientationHorizontal);
|
||||||
|
|||||||
@@ -81,14 +81,6 @@ void submenu_add_lockable_item(
|
|||||||
*/
|
*/
|
||||||
void submenu_change_item_label(Submenu* submenu, uint32_t index, const char* label);
|
void submenu_change_item_label(Submenu* submenu, uint32_t index, const char* label);
|
||||||
|
|
||||||
/** Change label of an existing item
|
|
||||||
*
|
|
||||||
* @param submenu Submenu instance
|
|
||||||
* @param index The index of the item
|
|
||||||
* @param label The new label
|
|
||||||
*/
|
|
||||||
void submenu_change_item_label(Submenu* submenu, uint32_t index, const char* label);
|
|
||||||
|
|
||||||
/** Remove all items from submenu
|
/** Remove all items from submenu
|
||||||
*
|
*
|
||||||
* @param submenu Submenu instance
|
* @param submenu Submenu instance
|
||||||
|
|||||||
Reference in New Issue
Block a user