From 5fd78ce0d71d582081d30d86aa72f4ebf7ed7d3a Mon Sep 17 00:00:00 2001 From: jfrickmann Date: Thu, 26 Aug 2021 10:49:45 -0400 Subject: [PATCH] Updated libopenui --- radio/src/gui/colorlcd/themes/480_default.cpp | 21 ------------------- radio/src/lua/api_colorlcd.cpp | 5 +++-- radio/src/thirdparty/libopenui | 2 +- 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/radio/src/gui/colorlcd/themes/480_default.cpp b/radio/src/gui/colorlcd/themes/480_default.cpp index db4da550b..8a09c1eda 100644 --- a/radio/src/gui/colorlcd/themes/480_default.cpp +++ b/radio/src/gui/colorlcd/themes/480_default.cpp @@ -282,27 +282,6 @@ class Theme480: public OpenTxTheme void update() const override { - TRACE("TODO THEME::UPDATE()"); -#if 0 - uint32_t color = g_eeGeneral.themeData.options[1].value.unsignedValue; - uint32_t bg_color = UNEXPECTED_SHUTDOWN() ? WHITE : g_eeGeneral.themeData.options[0].value.unsignedValue; - - lcdColorTable[COLOR_THEME_SECONDARY3_INDEX] = bg_color; - lcdColorTable[COLOR_THEME_FOCUS_INDEX] = color; - lcdColorTable[COLOR_THEME_FOCUS_INDEX] = color; - lcdColorTable[COLOR_THEME_PRIMARY3_INDEX] = color; - lcdColorTable[COLOR_THEME_SECONDARY1_INDEX] = color; - lcdColorTable[COLOR_THEME_WARNING_INDEX] = color; - lcdColorTable[COLOR_THEME_SECONDARY1_INDEX] = color; - lcdColorTable[COLOR_THEME_PRIMARY3_INDEX] = - RGB(GET_RED(color)>>1, GET_GREEN(color)>>1, GET_BLUE(color)>>1); - lcdColorTable[COLOR_THEME_FOCUS_INDEX] = color; - lcdColorTable[COLOR_THEME_SECONDARY1_INDEX] = color; - #define DARKER(x) ((x * 70) / 100) - lcdColorTable[COLOR_THEME_PRIMARY2_INDEX] = RGB(DARKER(GET_RED(color)), DARKER(GET_GREEN(color)), DARKER(GET_BLUE(color))); - lcdColorTable[COLOR_THEME_SECONDARY1_INDEX] = color; - lcdColorTable[COLOR_THEME_FOCUS_INDEX] = color; -#endif loadIcons(); loadThemeBitmaps(); } diff --git a/radio/src/lua/api_colorlcd.cpp b/radio/src/lua/api_colorlcd.cpp index 7be6b70d0..9b38625e1 100644 --- a/radio/src/lua/api_colorlcd.cpp +++ b/radio/src/lua/api_colorlcd.cpp @@ -729,9 +729,10 @@ static int luaLcdSetColor(lua_State *L) unsigned int index = COLOR_VAL(luaL_checkunsigned(L, 1)); LcdFlags flags = luaL_checkunsigned(L, 2); - if (index < LCD_COLOR_COUNT) + if (index < LCD_COLOR_COUNT) { lcdColorTable[index] = COLOR_VAL(flagsRGB(flags)); - + OpenTxTheme::instance()->update(); + } return 0; } diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 5c708913e..041c918df 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 5c708913e7e2fe370c61e1b1cc13df0a4003501d +Subproject commit 041c918df427dcac729667470b8c5819b1f3a325