feedc0de/esp-gui-lib
1
0
Fork 0
Code Issues 6 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Merge pull request #32 from CommanderRedYT/bicycle

Browse Source
This commit is contained in:
Florian Wetzel
2025-04-10 12:19:44 +02:00
committed by GitHub
parent 3438b20b58 6074189811
commit ab7319edde
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Kconfig.projbuild
View File

@ -4,4 +4,8 @@ config ESPGUI_MENUDISPLAY_ROWS
int "Number of rows for MenuDisplays" int "Number of rows for MenuDisplays"
default 10 default 10
config ESPGUI_MENUITEM_BACKGROUND_COLOR
hex "MenuItem background color"
default 0x5AEB
endmenu endmenu

8
src/menudisplay.cpp
View File

@ -149,7 +149,7 @@ void MenuDisplay::redraw(TftInterface &tft)
if (relativeIndex != m_highlightedIndex) if (relativeIndex != m_highlightedIndex)
{ {
drawItemRect(*labelsIter, TFT_GREY); drawItemRect(*labelsIter, CONFIG_ESPGUI_MENUITEM_BACKGROUND_COLOR);
*iconsIter = nullptr; *iconsIter = nullptr;
labelsIter->start(tft); labelsIter->start(tft);
@ -166,20 +166,20 @@ void MenuDisplay::redraw(TftInterface &tft)
labelsIter->start(tft); labelsIter->start(tft);
} }
labelsIter->redraw(tft, item.text(), item.color(), selected ? TFT_GREY : TFT_BLACK, item.font()); labelsIter->redraw(tft, item.text(), item.color(), selected ? CONFIG_ESPGUI_MENUITEM_BACKGROUND_COLOR : TFT_BLACK, item.font());
if (const auto icon = item.icon(selected); icon != *iconsIter) if (const auto icon = item.icon(selected); icon != *iconsIter)
{ {
if (icon) if (icon)
tft.pushImage(6, labelsIter->y() + 1, *icon); tft.pushImage(6, labelsIter->y() + 1, *icon);
else if (*iconsIter) else if (*iconsIter)
tft.fillRect(6, labelsIter->y() + 1, 24, 24, selected ? TFT_GREY : TFT_BLACK); tft.fillRect(6, labelsIter->y() + 1, 24, 24, selected ? CONFIG_ESPGUI_MENUITEM_BACKGROUND_COLOR : TFT_BLACK);
*iconsIter = icon; *iconsIter = icon;
} }
// if (selected && (relativeIndex != m_highlightedIndex)) // if (selected && (relativeIndex != m_highlightedIndex))
// { // {
// drawItemRect(*labelsIter, TFT_GREY); // drawItemRect(*labelsIter, CONFIG_ESPGUI_MENUITEM_BACKGROUND_COLOR);
// } // }
labelsIter++; labelsIter++;