Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-12 15:38:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev

Browse Source
This commit is contained in:
Willy-JL
2024-04-19 22:33:39 +01:00
parent a2fc553bef c87683596a
commit e3cc377b56
5 changed files with 119 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
applications/services/gui/modules/menu.c
View File

@@ -73,13 +73,11 @@ static void menu_centered_icon(
size_t y,
size_t width,
size_t height) {
if(item->icon) {
canvas_draw_icon_animation(
canvas,
x + (width - item->icon->icon->width) / 2,
y + (height - item->icon->icon->height) / 2,
item->icon);
}
canvas_draw_icon_animation(
canvas,
x + (width - item->icon->icon->width) / 2,
y + (height - item->icon->icon->height) / 2,
item->icon);
}
static size_t menu_scroll_counter(MenuModel* model, bool selected) {
@@ -482,8 +480,8 @@ static void menu_enter(void* context) {
menu->view,
MenuModel * model,
{
MenuItem* item = MenuItemArray_get(model->items, model->position);
if(item && item->icon) {
if(MenuItemArray_size(model->items)) {
MenuItem* item = MenuItemArray_get(model->items, model->position);
icon_animation_start(item->icon);
}
model->scroll_counter = 0;
@@ -498,14 +496,9 @@ static void menu_exit(void* context) {
menu->view,
MenuModel * model,
{
// If menu_reset() is called before view exit, model->items is reset
// But for some reason, even with size 0, array get() returns a non-null pointer?
// MLIB docs have no mention of out of bounds condition, seems weird
if(model->position < MenuItemArray_size(model->items)) {
if(MenuItemArray_size(model->items)) {
MenuItem* item = MenuItemArray_get(model->items, model->position);
if(item && item->icon) {
icon_animation_stop(item->icon);
}
icon_animation_stop(item->icon);
}
},
false);
@@ -608,14 +601,10 @@ void menu_set_selected_item(Menu* menu, uint32_t index) {
model->scroll_counter = 0;
MenuItem* item = MenuItemArray_get(model->items, model->position);
if(item && item->icon) {
icon_animation_stop(item->icon);
}
icon_animation_stop(item->icon);
item = MenuItemArray_get(model->items, index);
if(item && item->icon) {
icon_animation_start(item->icon);
}
icon_animation_start(item->icon);
model->position = index;
}
@@ -836,7 +825,7 @@ static void menu_process_ok(Menu* menu) {
menu->view,
MenuModel * model,
{
if(model->position < MenuItemArray_size(model->items)) {
if(MenuItemArray_size(model->items)) {
item = MenuItemArray_get(model->items, model->position);
}
},