Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GUI: Fix array out of bounds in menu exit #3604

Merged
merged 5 commits into from
Apr 19, 2024
Merged

GUI: Fix array out of bounds in menu exit #3604

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2df55b8
GUI: Fix array out of bounds in menu exit
Willy-JL Apr 19, 2024
a688e70
Merge branch 'dev' into menu-exit-fix
skotopes Apr 19, 2024
fec4451
Gui: fix incorrect empty menu handling
skotopes Apr 19, 2024
23ed102
Gui: add missing item check in menu ok handling
skotopes Apr 19, 2024
5b8e46d
Gui: remove dead code from menu module
skotopes Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 24 additions & 34 deletions applications/services/gui/modules/menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,19 @@ static void menu_draw_callback(Canvas* canvas, void* _model) {
canvas_set_font(canvas, FontSecondary);
shift_position = (0 + position + items_count - 1) % items_count;
item = MenuItemArray_get(model->items, shift_position);
if(item->icon) {
canvas_draw_icon_animation(canvas, 4, 3, item->icon);
}
canvas_draw_icon_animation(canvas, 4, 3, item->icon);
canvas_draw_str(canvas, 22, 14, item->label);
// Second line main
canvas_set_font(canvas, FontPrimary);
shift_position = (1 + position + items_count - 1) % items_count;
item = MenuItemArray_get(model->items, shift_position);
if(item->icon) {
canvas_draw_icon_animation(canvas, 4, 25, item->icon);
}
canvas_draw_icon_animation(canvas, 4, 25, item->icon);
canvas_draw_str(canvas, 22, 36, item->label);
// Third line
canvas_set_font(canvas, FontSecondary);
shift_position = (2 + position + items_count - 1) % items_count;
item = MenuItemArray_get(model->items, shift_position);
if(item->icon) {
canvas_draw_icon_animation(canvas, 4, 47, item->icon);
}
canvas_draw_icon_animation(canvas, 4, 47, item->icon);
canvas_draw_str(canvas, 22, 58, item->label);
// Frame and scrollbar
elements_frame(canvas, 0, 21, 128 - 5, 21);
Expand Down Expand Up @@ -107,8 +101,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);
}
},
Expand All @@ -121,8 +115,8 @@ static void menu_exit(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_stop(item->icon);
}
},
Expand Down Expand Up @@ -230,19 +224,17 @@ static void menu_process_up(Menu* menu) {
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_stop(item->icon);
}

if(model->position > 0) {
model->position--;
} else {
model->position = MenuItemArray_size(model->items) - 1;
}
if(model->position > 0) {
model->position--;
} else {
model->position = MenuItemArray_size(model->items) - 1;
}

item = MenuItemArray_get(model->items, model->position);
if(item && item->icon) {
item = MenuItemArray_get(model->items, model->position);
icon_animation_start(item->icon);
}
},
Expand All @@ -254,19 +246,17 @@ static void menu_process_down(Menu* menu) {
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_stop(item->icon);
}

if(model->position < MenuItemArray_size(model->items) - 1) {
model->position++;
} else {
model->position = 0;
}
if(model->position < MenuItemArray_size(model->items) - 1) {
model->position++;
} else {
model->position = 0;
}

item = MenuItemArray_get(model->items, model->position);
if(item && item->icon) {
item = MenuItemArray_get(model->items, model->position);
icon_animation_start(item->icon);
}
},
Expand All @@ -279,7 +269,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);
}
},
Expand Down