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

8
applications/lfrfid/view/elements/icon-element.cpp
View File

@@ -7,8 +7,8 @@ IconElement::~IconElement() {
}
void IconElement::draw(Canvas* canvas) {
if(name != I_Empty_1x1) {
canvas_draw_icon_name(canvas, x, y, name);
if(icon != NULL) {
canvas_draw_icon(canvas, x, y, icon);
}
}
@@ -16,9 +16,9 @@ bool IconElement::input(InputEvent* event) {
return false;
}
void IconElement::set_icon(uint8_t _x, uint8_t _y, IconName _name) {
void IconElement::set_icon(uint8_t _x, uint8_t _y, const Icon* _icon) {
lock_model();
name = _name;
icon = _icon;
x = _x;
y = _y;
unlock_model(true);