Skip to content

Fix Ethernet theme image + clearing of screen when theme is active but image not available #1769

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

Merged
pr3y merged 3 commits into from
Oct 27, 2025
Merged

Fix Ethernet theme image + clearing of screen when theme is active but image not available #1769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2a45a4
Fix Ethernet theme image
emericklaw Oct 25, 2025
7a13e0b
Remove debug print
emericklaw Oct 25, 2025
817a097
Clear larger area if theme image is unavailable but only if theme is …
emericklaw Oct 25, 2025
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
4 changes: 4 additions & 0 deletions include/MenuItemInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ class MenuItemInterface {
void draw(float scale = 1) {
if (rotation != bruceConfig.rotation) resetCoordinates();
if (!getTheme()) {
if (bruceConfig.themePath != "") {
// Image is not available for active theme, clear larger area
tft.fillRect(0, 27, tftWidth, tftHeight - 27, bruceConfig.bgColor);
}
drawIcon(scale);
drawArrows(scale);
drawTitle(scale);
Expand Down
6 changes: 5 additions & 1 deletion src/core/menu_items/EthernetMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ void EthernetMenu::optionsMenu() {

void EthernetMenu::drawIconImg() {
drawImg(
*bruceConfig.themeFS(), bruceConfig.getThemeItemImg(bruceConfig.theme.paths.rfid), 0, imgCenterY, true
*bruceConfig.themeFS(),
bruceConfig.getThemeItemImg(bruceConfig.theme.paths.ethernet),
0,
imgCenterY,
true
);
}
void EthernetMenu::drawIcon(float scale) {
Expand Down
2 changes: 1 addition & 1 deletion src/core/menu_items/EthernetMenu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class EthernetMenu : public MenuItemInterface {
void optionsMenu(void);
void drawIcon(float scale);
void drawIconImg();
bool getTheme() { return bruceConfig.theme.rfid; }
bool getTheme() { return bruceConfig.theme.ethernet; }
};

#endif
Expand Down