piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[Horus] Menus icons now in cache

Browse Source 
I hope it will reduce calculation time a little bit!
This commit is contained in:
Bertrand Songis
2016-04-07 08:26:04 +02:00
parent b1e5e06d5b
commit eaed9dd1a9
86 changed files with 373 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/horus/widgets.cpp
+10 -15
View File
@@ -129,11 +129,11 @@ void drawShadow(coord_t x, coord_t y, coord_t w, coord_t h)
uint8_t linesDisplayed;
void drawScreenTemplate(const char * title, const uint8_t * icon, uint32_t options)
void drawMenuTemplate(const char * title, uint8_t icon, const uint8_t * icons, uint32_t options)
{
coord_t bodyTop, bodyBottom;
theme->drawTopbarBackground(icon);
theme->drawTopbarBackground(icons ? icons[0] : icon);
// Menu title bar
if (options & OPTION_MENU_TITLE_BAR) {
@@ -144,6 +144,14 @@ void drawScreenTemplate(const char * title, const uint8_t * icon, uint32_t optio
if (title) {
lcdDrawText(MENUS_MARGIN_LEFT, MENU_TITLE_TOP+2, title, MENU_TITLE_COLOR);
}
if (icons) {
for (int i=0; i<menuPageCount; i++) {
if (menuPageIndex != i) {
theme->drawMenuIcon(icons[i+1], i, false);
}
}
theme->drawMenuIcon(icons[menuPageIndex+1], menuPageIndex, true);
}
}
else {
linesDisplayed = NUM_BODY_LINES + 1;
@@ -171,19 +179,6 @@ void drawScreenTemplate(const char * title, const uint8_t * icon, uint32_t optio
}
}
void drawMenuTemplate(const char * title, const uint8_t * const * icons, uint32_t options)
{
drawScreenTemplate(title, icons[0], OPTION_MENU_TITLE_BAR);
lcdDrawBitmapPattern(58+menuPageIndex*MENU_ICONS_SPACING-10, 0, LBM_CURRENT_BG, HEADER_CURRENT_BGCOLOR);
lcdDrawBitmapPattern(58+menuPageIndex*MENU_ICONS_SPACING-10, 0, LBM_CURRENT_SHADOW, TRIM_SHADOW_COLOR);
lcdDrawBitmapPattern(58+menuPageIndex*MENU_ICONS_SPACING, MENU_TITLE_TOP-9, LBM_CURRENT_DOT, MENU_TITLE_COLOR);
for (int i=0; i<menuPageCount; i++) {
lcdDrawBitmapPattern(50+i*MENU_ICONS_SPACING, 7, icons[i+1], MENU_TITLE_COLOR);
}
}
select_menu_value_t selectMenuItem(coord_t x, coord_t y, const pm_char * values, select_menu_value_t value, select_menu_value_t min, select_menu_value_t max, LcdFlags attr, evt_t event)
{
if (attr) value = checkIncDec(event, value, min, max, (menuVerticalPositions[0] == 0) ? EE_MODEL : EE_GENERAL);