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

GUI: Icons and IconsAnimation refactoring. Switch assets to new Icon Api (#566)

Browse Source 
* GUI: Icons and IconsAnimation refactoring. Switch assets to new Icon API.
* Gui: icon and animation draw now do not accept null pointer
* Format Sources
* Fix no debug build
* Furi: stricter checks in memmgr
This commit is contained in:
あく
2021-07-07 11:57:49 +03:00
committed by GitHub
parent 607e873404
commit a7283280ef
82 changed files with 1093 additions and 1053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
applications/menu/menu.c
View File

@@ -16,7 +16,7 @@ struct Menu {
// GUI
Gui* gui;
ViewPort* view_port;
Icon* icon;
IconAnimation* icon;
// State
MenuItem* root;
@@ -79,19 +79,19 @@ void menu_draw_primary(Menu* menu, Canvas* canvas) {
canvas_set_font(canvas, FontSecondary);
shift_position = (0 + position + items_count - 1) % (MenuItemArray_size(*items));
item = *MenuItemArray_get(*items, shift_position);
canvas_draw_icon(canvas, 4, 3, menu_item_get_icon(item));
canvas_draw_icon_animation(canvas, 4, 3, menu_item_get_icon(item));
canvas_draw_str(canvas, 22, 14, menu_item_get_label(item));
// Second line main
canvas_set_font(canvas, FontPrimary);
shift_position = (1 + position + items_count - 1) % (MenuItemArray_size(*items));
item = *MenuItemArray_get(*items, shift_position);
canvas_draw_icon(canvas, 4, 25, menu_item_get_icon(item));
canvas_draw_icon_animation(canvas, 4, 25, menu_item_get_icon(item));
canvas_draw_str(canvas, 22, 36, menu_item_get_label(item));
// Third line
canvas_set_font(canvas, FontSecondary);
shift_position = (2 + position + items_count - 1) % (MenuItemArray_size(*items));
item = *MenuItemArray_get(*items, shift_position);
canvas_draw_icon(canvas, 4, 47, menu_item_get_icon(item));
canvas_draw_icon_animation(canvas, 4, 47, menu_item_get_icon(item));
canvas_draw_str(canvas, 22, 58, menu_item_get_label(item));
// Frame and scrollbar
// elements_frame(canvas, 0, 0, 128 - 5, 21);
@@ -163,17 +163,17 @@ void menu_view_port_callback(Canvas* canvas, void* context) {
release_mutex((ValueMutex*)context, menu);
}
void menu_set_icon(Menu* menu, Icon* icon) {
void menu_set_icon(Menu* menu, IconAnimation* icon) {
furi_assert(menu);
if(menu->icon) {
icon_stop_animation(menu->icon);
icon_animation_stop(menu->icon);
}
menu->icon = icon;
if(menu->icon) {
icon_start_animation(menu->icon);
icon_animation_start(menu->icon);
}
}