diff --git a/radio/src/thirdparty/libopenui/src/dialog.cpp b/radio/src/thirdparty/libopenui/src/dialog.cpp index 4f4f2e2be..f203b3084 100644 --- a/radio/src/thirdparty/libopenui/src/dialog.cpp +++ b/radio/src/thirdparty/libopenui/src/dialog.cpp @@ -36,7 +36,7 @@ void Dialog::paint(BitmapBuffer * dc) dc->drawRect(0, 0, width() - 1, height() - 1, 1, SOLID, DEFAULT_COLOR); dc->drawSolidFilledRect(1, 1, width() - 3, PAGE_LINE_HEIGHT, TITLE_BGCOLOR); dc->drawText(FIELD_PADDING_LEFT, FIELD_PADDING_TOP, title.c_str(), MENU_TITLE_COLOR); - dc->drawSolidFilledRect(1, PAGE_LINE_HEIGHT + 1, width() - 3, height() - PAGE_LINE_HEIGHT - 3, TEXT_BGCOLOR); + dc->drawSolidFilledRect(1, PAGE_LINE_HEIGHT + 1, width() - 3, height() - PAGE_LINE_HEIGHT - 3, DEFAULT_BGCOLOR); } void Dialog::deleteLater() diff --git a/radio/src/thirdparty/libopenui/src/fab_icon_button.cpp b/radio/src/thirdparty/libopenui/src/fab_icon_button.cpp index 99435d4a6..4e8062c25 100644 --- a/radio/src/thirdparty/libopenui/src/fab_icon_button.cpp +++ b/radio/src/thirdparty/libopenui/src/fab_icon_button.cpp @@ -44,6 +44,6 @@ void FabIconButton::paint(BitmapBuffer * dc) dc->drawBitmap(0, 0, checked() ? &ALPHA_BUTTON_ON : &ALPHA_BUTTON_OFF); const BitmapBuffer * mask = theme->getIconMask(icon); if (mask) { - dc->drawMask((68 - mask->getWidth()) / 2, (68 - mask->getHeight()) / 2, mask, TEXT_BGCOLOR); + dc->drawMask((68 - mask->getWidth()) / 2, (68 - mask->getHeight()) / 2, mask, DEFAULT_BGCOLOR); } } diff --git a/radio/src/thirdparty/libopenui/src/libopenui_defines.h b/radio/src/thirdparty/libopenui/src/libopenui_defines.h index c9a2f95c3..a1caeb96a 100644 --- a/radio/src/thirdparty/libopenui/src/libopenui_defines.h +++ b/radio/src/thirdparty/libopenui/src/libopenui_defines.h @@ -123,7 +123,7 @@ enum FontSizeIndex #define COLOR_IDX(att) uint8_t((att) >> 16) //#define DEFAULT_COLOR COLOR(DEFAULT_COLOR_INDEX) -//#define TEXT_BGCOLOR COLOR(TEXT_BGCOLOR_INDEX) +//#define DEFAULT_BGCOLOR COLOR(DEFAULT_BGCOLOR_INDEX) //#define FOCUS_COLOR COLOR(FOCUS_COLOR_INDEX) //#define FOCUS_BGCOLOR COLOR(FOCUS_BGCOLOR_INDEX) //#define TEXT_STATUSBAR_COLOR COLOR(TEXT_STATUSBAR_COLOR_INDEX) diff --git a/radio/src/thirdparty/libopenui/src/page.cpp b/radio/src/thirdparty/libopenui/src/page.cpp index 6f86287ad..021818ab5 100644 --- a/radio/src/thirdparty/libopenui/src/page.cpp +++ b/radio/src/thirdparty/libopenui/src/page.cpp @@ -71,7 +71,7 @@ void Page::deleteLater() void Page::paint(BitmapBuffer * dc) { - dc->clear(TEXT_BGCOLOR); + dc->clear(DEFAULT_BGCOLOR); } #if defined(HARDWARE_KEYS) diff --git a/radio/src/thirdparty/libopenui/src/tabsgroup.cpp b/radio/src/thirdparty/libopenui/src/tabsgroup.cpp index 2c2b31365..3563feb32 100644 --- a/radio/src/thirdparty/libopenui/src/tabsgroup.cpp +++ b/radio/src/thirdparty/libopenui/src/tabsgroup.cpp @@ -177,7 +177,7 @@ void TabsGroup::onKeyEvent(event_t event) void TabsGroup::paint(BitmapBuffer * dc) { - dc->clear(TEXT_BGCOLOR); + dc->clear(DEFAULT_BGCOLOR); } #if defined(HARDWARE_TOUCH)