From 8ad093ea86972684f793b7f0d3425149731cc26b Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 4 Oct 2019 19:05:32 +0200 Subject: [PATCH] Cosmetics --- radio/src/cli.cpp | 6 ++-- radio/src/gui/colorlcd/colors.h | 2 +- radio/src/gui/colorlcd/curve.cpp | 6 ++-- radio/src/gui/colorlcd/curves.cpp | 4 +-- radio/src/gui/colorlcd/draw_functions.cpp | 4 +-- radio/src/gui/colorlcd/material-backup.cpp | 2 +- radio/src/gui/colorlcd/model_select.cpp | 8 ++--- radio/src/gui/colorlcd/modelslist.cpp | 2 +- radio/src/gui/colorlcd/theme.cpp | 8 ++--- radio/src/gui/colorlcd/themes/flysky.cpp | 36 +++++++++---------- radio/src/gui/colorlcd/themes/frsky.cpp | 36 +++++++++---------- radio/src/gui/colorlcd/topbar.cpp | 4 +-- radio/src/lua/api_general.cpp | 2 +- radio/src/lua/api_lcd.cpp | 4 +-- .../targets/horus/bootloader/boot_menu.cpp | 4 +-- radio/src/targets/horus/libopenui_config.h | 2 +- .../src/targets/nv14/bootloader/boot_menu.cpp | 4 +-- radio/src/targets/nv14/libopenui_config.h | 2 +- radio/src/tests/lcd_480x272.cpp | 8 ++--- 19 files changed, 72 insertions(+), 72 deletions(-) diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp index 881ecf4c0..86c41c13f 100644 --- a/radio/src/cli.cpp +++ b/radio/src/cli.cpp @@ -354,17 +354,17 @@ typedef void (*timedTestFunc_t)(void); void testDrawSolidFilledRectangle() { - lcdDrawFilledRect(0, 0, LCD_W, LCD_H, SOLID, TEXT_BGCOLOR); + lcdDrawFilledRect(0, 0, LCD_W, LCD_H, SOLID, DEFAULT_BGCOLOR); } void testDrawFilledRectangle() { - lcdDrawFilledRect(0, 0, LCD_W, LCD_H, DOTTED, TEXT_BGCOLOR); + lcdDrawFilledRect(0, 0, LCD_W, LCD_H, DOTTED, DEFAULT_BGCOLOR); } void testDrawSolidFilledRoundedRectangle() { - lcdDrawFilledRect(0, 0, LCD_W/2, LCD_H/2, SOLID, ROUND|TEXT_BGCOLOR); + lcdDrawFilledRect(0, 0, LCD_W/2, LCD_H/2, SOLID, ROUND|DEFAULT_BGCOLOR); } void testDrawBlackOverlay() diff --git a/radio/src/gui/colorlcd/colors.h b/radio/src/gui/colorlcd/colors.h index d3a491e31..9ca358ac9 100644 --- a/radio/src/gui/colorlcd/colors.h +++ b/radio/src/gui/colorlcd/colors.h @@ -36,7 +36,7 @@ #define GREEN RGB(25, 150, 50) #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/gui/colorlcd/curve.cpp b/radio/src/gui/colorlcd/curve.cpp index f4c98e8bd..6047e016f 100644 --- a/radio/src/gui/colorlcd/curve.cpp +++ b/radio/src/gui/colorlcd/curve.cpp @@ -94,12 +94,12 @@ void Curve::drawPosition(BitmapBuffer * dc) // the point (white inside) dc->drawBitmapPattern(x-4, y-4, LBM_CURVE_POINT, CURVE_CURSOR_COLOR); - dc->drawBitmapPattern(x-4, y-4, LBM_CURVE_POINT_CENTER, TEXT_BGCOLOR); + dc->drawBitmapPattern(x-4, y-4, LBM_CURVE_POINT_CENTER, DEFAULT_BGCOLOR); char coords[16]; strAppendSigned(strAppend(strAppendSigned(coords, calcRESXto100(valueX)), ","), calcRESXto100(valueY)); dc->drawSolidFilledRect(10, 11, 1 + getTextWidth(coords, 0, SMLSIZE), 17, CURVE_CURSOR_COLOR); - dc->drawText(11, 10, coords, SMLSIZE|TEXT_BGCOLOR); + dc->drawText(11, 10, coords, SMLSIZE|DEFAULT_BGCOLOR); } void Curve::drawPoint(BitmapBuffer * dc, const CurvePoint & point) @@ -108,7 +108,7 @@ void Curve::drawPoint(BitmapBuffer * dc, const CurvePoint & point) coord_t y = getPointY(point.coords.y); dc->drawBitmapPattern(x-4, y-4, LBM_CURVE_POINT, point.flags); - dc->drawBitmapPattern(x-4, y-4, LBM_CURVE_POINT_CENTER, TEXT_BGCOLOR); + dc->drawBitmapPattern(x-4, y-4, LBM_CURVE_POINT_CENTER, DEFAULT_BGCOLOR); } void Curve::paint(BitmapBuffer * dc) diff --git a/radio/src/gui/colorlcd/curves.cpp b/radio/src/gui/colorlcd/curves.cpp index 6ee67e295..25a5ad569 100644 --- a/radio/src/gui/colorlcd/curves.cpp +++ b/radio/src/gui/colorlcd/curves.cpp @@ -84,7 +84,7 @@ void drawCurveHorizontalScale(BitmapBuffer * dc) void drawCurveCoord(BitmapBuffer * dc, int x, int y, const char * text, bool active) { dc->drawSolidFilledRect(x, y, CURVE_COORD_WIDTH, CURVE_COORD_HEIGHT, CURVE_CURSOR_COLOR); - dc->drawText(x+3+(CURVE_COORD_WIDTH-1-getTextWidth(text, SMLSIZE))/2, y+1, text, LEFT|SMLSIZE|TEXT_BGCOLOR); + dc->drawText(x+3+(CURVE_COORD_WIDTH-1-getTextWidth(text, SMLSIZE))/2, y+1, text, LEFT|SMLSIZE|DEFAULT_BGCOLOR); if (active) { dc->drawBitmapPattern(x, y, LBM_CURVE_COORD_SHADOW, DEFAULT_COLOR); } @@ -93,5 +93,5 @@ void drawCurveCoord(BitmapBuffer * dc, int x, int y, const char * text, bool act void drawCurvePoint(BitmapBuffer * dc, int x, int y, LcdFlags color) { dc->drawBitmapPattern(x, y, LBM_CURVE_POINT, color); - dc->drawBitmapPattern(x, y, LBM_CURVE_POINT_CENTER, TEXT_BGCOLOR); + dc->drawBitmapPattern(x, y, LBM_CURVE_POINT_CENTER, DEFAULT_BGCOLOR); } diff --git a/radio/src/gui/colorlcd/draw_functions.cpp b/radio/src/gui/colorlcd/draw_functions.cpp index 85723bb41..9c2908a2f 100644 --- a/radio/src/gui/colorlcd/draw_functions.cpp +++ b/radio/src/gui/colorlcd/draw_functions.cpp @@ -163,7 +163,7 @@ void drawHorizontalSlider(BitmapBuffer * dc, coord_t x, coord_t y, int len, int } else { dc->drawBitmapPattern(x, y + 2, LBM_SLIDER_POINT_OUT, DEFAULT_COLOR); - dc->drawBitmapPattern(x, y + 2, LBM_SLIDER_POINT_MID, TEXT_BGCOLOR); + dc->drawBitmapPattern(x, y + 2, LBM_SLIDER_POINT_MID, DEFAULT_BGCOLOR); if ((options & INVERS) && (!(options & BLINK) || !BLINK_ON_PHASE)) dc->drawBitmapPattern(x, y + 2, LBM_SLIDER_POINT_IN, FOCUS_BGCOLOR); } @@ -276,7 +276,7 @@ void drawShutdownAnimation(uint32_t duration, uint32_t totalDuration, const char int quarter = duration / (totalDuration / 5); for (int i=1; i<=4; i++) { if (quarter >= i) { - lcd->drawSolidFilledRect(LCD_W / 2 - 70 + 24 * i, LCD_H / 2 - 10, 20, 20, TEXT_BGCOLOR); + lcd->drawSolidFilledRect(LCD_W / 2 - 70 + 24 * i, LCD_H / 2 - 10, 20, 20, DEFAULT_BGCOLOR); } } } diff --git a/radio/src/gui/colorlcd/material-backup.cpp b/radio/src/gui/colorlcd/material-backup.cpp index df3da446a..2ad7f8436 100644 --- a/radio/src/gui/colorlcd/material-backup.cpp +++ b/radio/src/gui/colorlcd/material-backup.cpp @@ -109,7 +109,7 @@ bool CheckBox(W * window, rect_t & rect, const char * label, uint8_t & value, Lc coord_t x = rect.x + rect.w - 20; if (hasFocus) { window->drawSolidFilledRect(x-1, rect.y+8, 14, 14, FOCUS_BGCOLOR); - window->drawSolidFilledRect(x+1, rect.y+10, 10, 10, TEXT_BGCOLOR); + window->drawSolidFilledRect(x+1, rect.y+10, 10, 10, DEFAULT_BGCOLOR); if (value) { window->drawSolidFilledRect(x+2, rect.y+11, 8, 8, FOCUS_BGCOLOR); } diff --git a/radio/src/gui/colorlcd/model_select.cpp b/radio/src/gui/colorlcd/model_select.cpp index 122393e54..cfe82b3ae 100644 --- a/radio/src/gui/colorlcd/model_select.cpp +++ b/radio/src/gui/colorlcd/model_select.cpp @@ -64,7 +64,7 @@ void drawModel(coord_t x, coord_t y, ModelCell * model, bool current, bool selec drawShadow(x, y, MODELCELL_WIDTH+2, MODELCELL_HEIGHT+2); if (selectMode == MODE_MOVE_MODEL) { lcd->drawMask(x+MODELCELL_WIDTH+2-modelselModelMoveBackground->getWidth(), y, modelselModelMoveBackground, TITLE_BGCOLOR); - lcd->drawMask(x+MODELCELL_WIDTH+2-modelselModelMoveBackground->getWidth()+12, y+5, modelselModelMoveIcon, TEXT_BGCOLOR); + lcd->drawMask(x+MODELCELL_WIDTH+2-modelselModelMoveBackground->getWidth()+12, y+5, modelselModelMoveIcon, DEFAULT_BGCOLOR); } } } @@ -178,7 +178,7 @@ bool menuModelWizard(event_t event) } strcpy(wizpath, WIZARD_PATH); strcpy(&wizpath[sizeof(WIZARD_PATH)-1], "/"); - lcdDrawSolidFilledRect(0, 0, LCD_W, LCD_H, TEXT_BGCOLOR); + lcdDrawSolidFilledRect(0, 0, LCD_W, LCD_H, DEFAULT_BGCOLOR); lcd->drawBitmap(0, 0, modelselWizardBackground); FRESULT res = f_opendir(&dir, WIZARD_PATH); if (res == FR_OK) { @@ -440,7 +440,7 @@ bool menuModelSelect(event_t event) } - lcdDrawSolidFilledRect(0, 0, LCD_W, LCD_H, TEXT_BGCOLOR); + lcdDrawSolidFilledRect(0, 0, LCD_W, LCD_H, DEFAULT_BGCOLOR); lcd->drawBitmap(0, 0, modelselIconBitmap); // Categories @@ -453,7 +453,7 @@ bool menuModelSelect(event_t event) lcdDrawSolidHorizontalLine(1, y-4, CATEGORIES_WIDTH-10, LINE_COLOR); } if (selectMode == MODE_RENAME_CATEGORY && currentCategory == *it) { - lcdDrawSolidFilledRect(0, y-INVERT_VERT_MARGIN+1, CATEGORIES_WIDTH-2, INVERT_LINE_HEIGHT, TEXT_BGCOLOR); + lcdDrawSolidFilledRect(0, y-INVERT_VERT_MARGIN+1, CATEGORIES_WIDTH-2, INVERT_LINE_HEIGHT, DEFAULT_BGCOLOR); editName(MENUS_MARGIN_LEFT, y, currentCategory->name, LEN_MODEL_FILENAME, event, 1, 0); if (s_editMode == 0 || event == EVT_KEY_BREAK(KEY_EXIT)) { modelslist.save(); diff --git a/radio/src/gui/colorlcd/modelslist.cpp b/radio/src/gui/colorlcd/modelslist.cpp index a61f2a480..37e60e7a5 100644 --- a/radio/src/gui/colorlcd/modelslist.cpp +++ b/radio/src/gui/colorlcd/modelslist.cpp @@ -99,7 +99,7 @@ void ModelCell::loadBitmap() if (buffer == NULL) { return; } - buffer->clear(TEXT_BGCOLOR); + buffer->clear(DEFAULT_BGCOLOR); if (error) { buffer->drawText(5, 2, "(Invalid Model)", DEFAULT_COLOR); diff --git a/radio/src/gui/colorlcd/theme.cpp b/radio/src/gui/colorlcd/theme.cpp index b7be7c631..b20e88196 100644 --- a/radio/src/gui/colorlcd/theme.cpp +++ b/radio/src/gui/colorlcd/theme.cpp @@ -98,7 +98,7 @@ void ThemeBase::drawThumb(BitmapBuffer * dc, coord_t x, coord_t y, uint32_t flag void ThemeBase::drawBackground(BitmapBuffer * dc) const { - dc->drawSolidFilledRect(0, 0, LCD_W, LCD_H, TEXT_BGCOLOR); + dc->drawSolidFilledRect(0, 0, LCD_W, LCD_H, DEFAULT_BGCOLOR); } void ThemeBase::drawMessageBox(const char * title, const char * text, const char * action, uint32_t type) const @@ -145,11 +145,11 @@ void ThemeBase::drawCheckBox(BitmapBuffer * dc, bool checked, coord_t x, coord_t if (focus) { dc->drawSolidFilledRect(x + 0, y + 2, 16, 16, FOCUS_BGCOLOR); if (checked) { - dc->drawSolidFilledRect(x + 2, y + 4, 12, 12, TEXT_BGCOLOR); + dc->drawSolidFilledRect(x + 2, y + 4, 12, 12, DEFAULT_BGCOLOR); dc->drawSolidFilledRect(x + 3, y + 5, 10, 10, SCROLLBOX_COLOR); } else { - dc->drawSolidFilledRect(x + 2, y + 4, 12, 12, TEXT_BGCOLOR); + dc->drawSolidFilledRect(x + 2, y + 4, 12, 12, DEFAULT_BGCOLOR); } } else { @@ -193,7 +193,7 @@ void ThemeBase::drawSlider(BitmapBuffer * dc, int vmin, int vmax, int value, con } dc->drawBitmapPattern(w, 5, LBM_SLIDER_POINT_OUT, DEFAULT_COLOR); - dc->drawBitmapPattern(w, 5, LBM_SLIDER_POINT_MID, TEXT_BGCOLOR); + dc->drawBitmapPattern(w, 5, LBM_SLIDER_POINT_MID, DEFAULT_BGCOLOR); // if ((options & INVERS) && (!(options & BLINK) || !BLINK_ON_PHASE)) if (focus) { dc->drawBitmapPattern(w, 5, LBM_SLIDER_POINT_IN, FOCUS_BGCOLOR); diff --git a/radio/src/gui/colorlcd/themes/flysky.cpp b/radio/src/gui/colorlcd/themes/flysky.cpp index d4feb15ba..7a0f57154 100644 --- a/radio/src/gui/colorlcd/themes/flysky.cpp +++ b/radio/src/gui/colorlcd/themes/flysky.cpp @@ -41,7 +41,7 @@ class FlyskyTheme: public ThemeBase TRACE("Load FlySky theme colors"); lcdColorTable[DEFAULT_COLOR_INDEX] = BLACK; - lcdColorTable[TEXT_BGCOLOR_INDEX] = WHITE; + lcdColorTable[DEFAULT_BGCOLOR_INDEX] = WHITE; lcdColorTable[FOCUS_COLOR_INDEX] = WHITE; lcdColorTable[FOCUS_BGCOLOR_INDEX] = RED; lcdColorTable[TEXT_STATUSBAR_COLOR_INDEX] = WHITE; @@ -186,7 +186,7 @@ class FlyskyTheme: public ThemeBase } if (currentMenuBackground) { currentMenuBackground->drawSolidFilledRect(0, 0, currentMenuBackground->getWidth(), MENU_HEADER_HEIGHT, HEADER_BGCOLOR); - currentMenuBackground->drawSolidFilledRect(0, MENU_HEADER_HEIGHT, currentMenuBackground->getWidth(), MENU_TITLE_TOP - MENU_HEADER_HEIGHT, TEXT_BGCOLOR); + currentMenuBackground->drawSolidFilledRect(0, MENU_HEADER_HEIGHT, currentMenuBackground->getWidth(), MENU_TITLE_TOP - MENU_HEADER_HEIGHT, DEFAULT_BGCOLOR); currentMenuBackground->drawSolidFilledRect(0, MENU_TITLE_TOP, currentMenuBackground->getWidth(), currentMenuBackground->getHeight() - MENU_TITLE_TOP, TITLE_BGCOLOR); currentMenuBackground->drawMask(0, 0, background, HEADER_CURRENT_BGCOLOR); currentMenuBackground->drawMask(0, 0, shadow, TRIM_SHADOW_COLOR); @@ -218,7 +218,7 @@ class FlyskyTheme: public ThemeBase // Model Selection screen delete modelselIconBitmap; - modelselIconBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_iconback.png", TITLE_BGCOLOR, TEXT_BGCOLOR); + modelselIconBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_iconback.png", TITLE_BGCOLOR, DEFAULT_BGCOLOR); if (modelselIconBitmap) { BitmapBuffer * bitmap = BitmapBuffer::load(getFilePath("modelsel/icon_default.png")); modelselIconBitmap->drawBitmap(20, 8, bitmap); @@ -226,13 +226,13 @@ class FlyskyTheme: public ThemeBase } delete modelselSdFreeBitmap; - modelselSdFreeBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_sdfree.png", DEFAULT_COLOR, TEXT_BGCOLOR); + modelselSdFreeBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_sdfree.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete modelselModelQtyBitmap; - modelselModelQtyBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelqty.png", DEFAULT_COLOR, TEXT_BGCOLOR); + modelselModelQtyBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelqty.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete modelselModelNameBitmap; - modelselModelNameBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelname.png", DEFAULT_COLOR, TEXT_BGCOLOR); + modelselModelNameBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelname.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete modelselModelMoveBackground; modelselModelMoveBackground = BitmapBuffer::loadMask(getFilePath("modelsel/mask_moveback.png")); @@ -245,10 +245,10 @@ class FlyskyTheme: public ThemeBase // Channels monitor screen delete chanMonLockedBitmap; - chanMonLockedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_lockch.png", DEFAULT_COLOR, TEXT_BGCOLOR); + chanMonLockedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_lockch.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete chanMonInvertedBitmap; - chanMonInvertedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_inver.png", DEFAULT_COLOR, TEXT_BGCOLOR); + chanMonInvertedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_inver.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); // Mixer setup screen delete mixerSetupMixerBitmap; @@ -261,19 +261,19 @@ class FlyskyTheme: public ThemeBase mixerSetupOutputBitmap = BitmapBuffer::loadMaskOnBackground("mask_sbar_output.png", MENU_TITLE_COLOR, HEADER_BGCOLOR); delete mixerSetupAddBitmap; - mixerSetupAddBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_add.png", DEFAULT_COLOR, TEXT_BGCOLOR); + mixerSetupAddBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_add.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete mixerSetupMultiBitmap; - mixerSetupMultiBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_multi.png", DEFAULT_COLOR, TEXT_BGCOLOR); + mixerSetupMultiBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_multi.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete mixerSetupReplaceBitmap; - mixerSetupReplaceBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_replace.png", DEFAULT_COLOR, TEXT_BGCOLOR); + mixerSetupReplaceBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_replace.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete mixerSetupLabelBitmap; - mixerSetupLabelBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_label.png", DEFAULT_COLOR, TEXT_BGCOLOR); + mixerSetupLabelBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_label.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete mixerSetupCurveBitmap; - mixerSetupCurveBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_curve.png", DEFAULT_COLOR, TEXT_BGCOLOR); + mixerSetupCurveBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_curve.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete mixerSetupSwitchIcon; mixerSetupSwitchIcon = BitmapBuffer::loadMask(getFilePath("mask_textline_switch.png")); @@ -282,13 +282,13 @@ class FlyskyTheme: public ThemeBase mixerSetupFlightmodeIcon = BitmapBuffer::loadMask(getFilePath("mask_textline_fm.png")); delete mixerSetupSlowBitmap; - mixerSetupSlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_slow.png", DEFAULT_COLOR, TEXT_BGCOLOR); + mixerSetupSlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_slow.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete mixerSetupDelayBitmap; - mixerSetupDelayBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delay.png", DEFAULT_COLOR, TEXT_BGCOLOR); + mixerSetupDelayBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delay.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete mixerSetupDelaySlowBitmap; - mixerSetupDelaySlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delayslow.png", DEFAULT_COLOR, TEXT_BGCOLOR); + mixerSetupDelaySlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delayslow.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); } void load() const override @@ -309,7 +309,7 @@ class FlyskyTheme: public ThemeBase uint32_t color = g_eeGeneral.themeData.options[1].unsignedValue; uint32_t bg_color = UNEXPECTED_SHUTDOWN() ? WHITE : g_eeGeneral.themeData.options[0].unsignedValue; - lcdColorTable[TEXT_BGCOLOR_INDEX] = bg_color; + lcdColorTable[DEFAULT_BGCOLOR_INDEX] = bg_color; lcdColorTable[FOCUS_BGCOLOR_INDEX] = color; lcdColorTable[SCROLLBOX_COLOR_INDEX] = color; lcdColorTable[CURVE_COLOR_INDEX] = color; @@ -355,7 +355,7 @@ class FlyskyTheme: public ThemeBase // else // dc->drawBitmap(5, 7, menuIconSelected[icon]); // - dc->drawSolidFilledRect(0, MENU_HEADER_HEIGHT, LCD_W, MENU_TITLE_TOP - MENU_HEADER_HEIGHT, TEXT_BGCOLOR); // the white separation line + dc->drawSolidFilledRect(0, MENU_HEADER_HEIGHT, LCD_W, MENU_TITLE_TOP - MENU_HEADER_HEIGHT, DEFAULT_BGCOLOR); // the white separation line dc->drawSolidFilledRect(0, MENU_TITLE_TOP, LCD_W, MENU_TITLE_HEIGHT, TITLE_BGCOLOR); // the title line background // if (title) { diff --git a/radio/src/gui/colorlcd/themes/frsky.cpp b/radio/src/gui/colorlcd/themes/frsky.cpp index 74783cfda..d6f8cf0e8 100644 --- a/radio/src/gui/colorlcd/themes/frsky.cpp +++ b/radio/src/gui/colorlcd/themes/frsky.cpp @@ -40,7 +40,7 @@ class FrskyTheme: public ThemeBase { TRACE("Load FrSky theme colors"); lcdColorTable[DEFAULT_COLOR_INDEX] = BLACK; - lcdColorTable[TEXT_BGCOLOR_INDEX] = WHITE; + lcdColorTable[DEFAULT_BGCOLOR_INDEX] = WHITE; lcdColorTable[FOCUS_COLOR_INDEX] = WHITE; lcdColorTable[FOCUS_BGCOLOR_INDEX] = RED; lcdColorTable[TEXT_STATUSBAR_COLOR_INDEX] = WHITE; @@ -158,7 +158,7 @@ class FrskyTheme: public ThemeBase if (currentMenuBackground) { currentMenuBackground->drawSolidFilledRect(0, 0, currentMenuBackground->getWidth(), MENU_HEADER_HEIGHT, HEADER_BGCOLOR); - currentMenuBackground->drawSolidFilledRect(0, MENU_HEADER_HEIGHT, currentMenuBackground->getWidth(), MENU_TITLE_TOP - MENU_HEADER_HEIGHT, TEXT_BGCOLOR); + currentMenuBackground->drawSolidFilledRect(0, MENU_HEADER_HEIGHT, currentMenuBackground->getWidth(), MENU_TITLE_TOP - MENU_HEADER_HEIGHT, DEFAULT_BGCOLOR); currentMenuBackground->drawSolidFilledRect(0, MENU_TITLE_TOP, currentMenuBackground->getWidth(), currentMenuBackground->getHeight() - MENU_TITLE_TOP, TITLE_BGCOLOR); currentMenuBackground->drawMask(0, 0, background, HEADER_CURRENT_BGCOLOR); currentMenuBackground->drawMask(0, 0, shadow, TRIM_SHADOW_COLOR); @@ -199,7 +199,7 @@ class FrskyTheme: public ThemeBase // Model Selection screen delete modelselIconBitmap; - modelselIconBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_iconback.png", TITLE_BGCOLOR, TEXT_BGCOLOR); + modelselIconBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_iconback.png", TITLE_BGCOLOR, DEFAULT_BGCOLOR); if (modelselIconBitmap) { BitmapBuffer * bitmap = BitmapBuffer::load(getFilePath("modelsel/icon_default.png")); modelselIconBitmap->drawBitmap(20, 8, bitmap); @@ -207,13 +207,13 @@ class FrskyTheme: public ThemeBase } delete modelselSdFreeBitmap; - modelselSdFreeBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_sdfree.png", DEFAULT_COLOR, TEXT_BGCOLOR); + modelselSdFreeBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_sdfree.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete modelselModelQtyBitmap; - modelselModelQtyBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelqty.png", DEFAULT_COLOR, TEXT_BGCOLOR); + modelselModelQtyBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelqty.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete modelselModelNameBitmap; - modelselModelNameBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelname.png", DEFAULT_COLOR, TEXT_BGCOLOR); + modelselModelNameBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelname.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete modelselModelMoveBackground; modelselModelMoveBackground = BitmapBuffer::loadMask(getFilePath("modelsel/mask_moveback.png")); @@ -226,10 +226,10 @@ class FrskyTheme: public ThemeBase // Channels monitor screen delete chanMonLockedBitmap; - chanMonLockedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_lockch.png", DEFAULT_COLOR, TEXT_BGCOLOR); + chanMonLockedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_lockch.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete chanMonInvertedBitmap; - chanMonInvertedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_inver.png", DEFAULT_COLOR, TEXT_BGCOLOR); + chanMonInvertedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_inver.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); // Mixer setup screen delete mixerSetupMixerBitmap; @@ -242,19 +242,19 @@ class FrskyTheme: public ThemeBase mixerSetupOutputBitmap = BitmapBuffer::loadMaskOnBackground("mask_sbar_output.png", MENU_TITLE_COLOR, HEADER_BGCOLOR); delete mixerSetupAddBitmap; - mixerSetupAddBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_add.png", DEFAULT_COLOR, TEXT_BGCOLOR); + mixerSetupAddBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_add.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete mixerSetupMultiBitmap; - mixerSetupMultiBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_multi.png", DEFAULT_COLOR, TEXT_BGCOLOR); + mixerSetupMultiBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_multi.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete mixerSetupReplaceBitmap; - mixerSetupReplaceBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_replace.png", DEFAULT_COLOR, TEXT_BGCOLOR); + mixerSetupReplaceBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_replace.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete mixerSetupLabelBitmap; - mixerSetupLabelBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_label.png", DEFAULT_COLOR, TEXT_BGCOLOR); + mixerSetupLabelBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_label.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete mixerSetupCurveBitmap; - mixerSetupCurveBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_curve.png", DEFAULT_COLOR, TEXT_BGCOLOR); + mixerSetupCurveBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_curve.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete mixerSetupSwitchIcon; mixerSetupSwitchIcon = BitmapBuffer::loadMask(getFilePath("mask_textline_switch.png")); @@ -263,13 +263,13 @@ class FrskyTheme: public ThemeBase mixerSetupFlightmodeIcon = BitmapBuffer::loadMask(getFilePath("mask_textline_fm.png")); delete mixerSetupSlowBitmap; - mixerSetupSlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_slow.png", DEFAULT_COLOR, TEXT_BGCOLOR); + mixerSetupSlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_slow.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete mixerSetupDelayBitmap; - mixerSetupDelayBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delay.png", DEFAULT_COLOR, TEXT_BGCOLOR); + mixerSetupDelayBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delay.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); delete mixerSetupDelaySlowBitmap; - mixerSetupDelaySlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delayslow.png", DEFAULT_COLOR, TEXT_BGCOLOR); + mixerSetupDelaySlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delayslow.png", DEFAULT_COLOR, DEFAULT_BGCOLOR); } void load() const override @@ -289,7 +289,7 @@ class FrskyTheme: public ThemeBase uint32_t color = g_eeGeneral.themeData.options[1].unsignedValue; uint32_t bg_color = UNEXPECTED_SHUTDOWN() ? WHITE : g_eeGeneral.themeData.options[0].unsignedValue; - lcdColorTable[TEXT_BGCOLOR_INDEX] = bg_color; + lcdColorTable[DEFAULT_BGCOLOR_INDEX] = bg_color; lcdColorTable[FOCUS_BGCOLOR_INDEX] = color; lcdColorTable[SCROLLBOX_COLOR_INDEX] = color; lcdColorTable[CURVE_COLOR_INDEX] = color; @@ -335,7 +335,7 @@ class FrskyTheme: public ThemeBase else dc->drawBitmap(5, 7, menuIconSelected[icon]); - dc->drawSolidFilledRect(0, MENU_HEADER_HEIGHT, LCD_W, MENU_TITLE_TOP - MENU_HEADER_HEIGHT, TEXT_BGCOLOR); // the white separation line + dc->drawSolidFilledRect(0, MENU_HEADER_HEIGHT, LCD_W, MENU_TITLE_TOP - MENU_HEADER_HEIGHT, DEFAULT_BGCOLOR); // the white separation line dc->drawSolidFilledRect(0, MENU_TITLE_TOP, LCD_W, MENU_TITLE_HEIGHT, TITLE_BGCOLOR); // the title line background if (title) { dc->drawText(MENUS_MARGIN_LEFT, MENU_TITLE_TOP + 1, title, MENU_TITLE_COLOR); diff --git a/radio/src/gui/colorlcd/topbar.cpp b/radio/src/gui/colorlcd/topbar.cpp index 3409b7968..12e59a935 100644 --- a/radio/src/gui/colorlcd/topbar.cpp +++ b/radio/src/gui/colorlcd/topbar.cpp @@ -105,7 +105,7 @@ void drawTopBar() att |= PREC1; } att |= (item.isOld() ? ALARM_COLOR : DEFAULT_COLOR); - lcdDrawSolidFilledRect(ALTITUDE_X, VOLTS_Y, ALTITUDE_W, ALTITUDE_H, TEXT_BGCOLOR); + lcdDrawSolidFilledRect(ALTITUDE_X, VOLTS_Y, ALTITUDE_W, ALTITUDE_H, DEFAULT_BGCOLOR); lcdDrawText(ALTITUDE_X+PADDING, VOLTS_Y+2, "Voltage", att); drawValueWithUnit(ALTITUDE_X+PADDING, VOLTS_Y+12, value, UNIT_VOLTS, DBLSIZE|LEFT|att); } @@ -119,7 +119,7 @@ void drawTopBar() TelemetrySensor & sensor = g_model.telemetrySensors[g_model.frsky.altitudeSource-1]; if (sensor.prec) value /= sensor.prec == 2 ? 100 : 10; LcdFlags att = (item.isOld() ? ALARM_COLOR : DEFAULT_COLOR); - lcdDrawSolidFilledRect(ALTITUDE_X, ALTITUDE_Y, ALTITUDE_W, ALTITUDE_H, TEXT_BGCOLOR); + lcdDrawSolidFilledRect(ALTITUDE_X, ALTITUDE_Y, ALTITUDE_W, ALTITUDE_H, DEFAULT_BGCOLOR); lcdDrawText(ALTITUDE_X+PADDING, ALTITUDE_Y+2, "Alt", att); drawValueWithUnit(ALTITUDE_X+PADDING, ALTITUDE_Y+12, value, UNIT_METERS, DBLSIZE|LEFT|att); } diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp index 054a402c6..a60f290ed 100644 --- a/radio/src/lua/api_general.cpp +++ b/radio/src/lua/api_general.cpp @@ -1637,7 +1637,7 @@ const luaR_value_entry opentxConstants[] = { { "STRING", ZoneOption::String }, { "CUSTOM_COLOR", CUSTOM_COLOR }, { "DEFAULT_COLOR", DEFAULT_COLOR }, - { "TEXT_BGCOLOR", TEXT_BGCOLOR }, + { "DEFAULT_BGCOLOR", DEFAULT_BGCOLOR }, { "FOCUS_COLOR", FOCUS_COLOR }, { "FOCUS_BGCOLOR", FOCUS_BGCOLOR }, { "LINE_COLOR", LINE_COLOR }, diff --git a/radio/src/lua/api_lcd.cpp b/radio/src/lua/api_lcd.cpp index e0b05ee20..9e9782966 100644 --- a/radio/src/lua/api_lcd.cpp +++ b/radio/src/lua/api_lcd.cpp @@ -53,7 +53,7 @@ static int luaLcdClear(lua_State *L) { if (luaLcdAllowed) { #if defined(COLORLCD) - LcdFlags color = luaL_optunsigned(L, 1, TEXT_BGCOLOR); + LcdFlags color = luaL_optunsigned(L, 1, DEFAULT_BGCOLOR); lcd->clear(color); #else lcdClear(); @@ -778,7 +778,7 @@ Set a color for specific area @param area (unsigned number) specific screen area in the list bellow * `CUSTOM_COLOR` * `DEFAULT_COLOR` - * `TEXT_BGCOLOR` + * `DEFAULT_BGCOLOR` * `FOCUS_COLOR` * `FOCUS_BGCOLOR` * `LINE_COLOR` diff --git a/radio/src/targets/horus/bootloader/boot_menu.cpp b/radio/src/targets/horus/bootloader/boot_menu.cpp index 4609243bf..329ff1efb 100644 --- a/radio/src/targets/horus/bootloader/boot_menu.cpp +++ b/radio/src/targets/horus/bootloader/boot_menu.cpp @@ -41,7 +41,7 @@ const uint8_t LBM_OK[] = { void bootloaderInitScreen() { lcdColorTable[DEFAULT_COLOR_INDEX] = BLACK; - lcdColorTable[TEXT_BGCOLOR_INDEX] = WHITE; + lcdColorTable[DEFAULT_BGCOLOR_INDEX] = WHITE; lcdColorTable[LINE_COLOR_INDEX] = RED; lcdColorTable[BARGRAPH1_COLOR_INDEX] = RED; lcdColorTable[BARGRAPH2_COLOR_INDEX] = RGB(73, 219, 62); // green @@ -70,7 +70,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str) lcdNextLayer(); #endif - lcd->clear(TEXT_BGCOLOR); + lcd->clear(DEFAULT_BGCOLOR); if (st == ST_START) { bootloaderDrawTitle(88, "HORUS BOOTLOADER"); diff --git a/radio/src/targets/horus/libopenui_config.h b/radio/src/targets/horus/libopenui_config.h index dc4b50297..27e7d6325 100644 --- a/radio/src/targets/horus/libopenui_config.h +++ b/radio/src/targets/horus/libopenui_config.h @@ -92,7 +92,7 @@ constexpr uint32_t ALERT_ACTION_TOP = 240; enum LcdColorIndex { DEFAULT_COLOR_INDEX, - TEXT_BGCOLOR_INDEX, + DEFAULT_BGCOLOR_INDEX, FOCUS_COLOR_INDEX, FOCUS_BGCOLOR_INDEX, TEXT_STATUSBAR_COLOR_INDEX, diff --git a/radio/src/targets/nv14/bootloader/boot_menu.cpp b/radio/src/targets/nv14/bootloader/boot_menu.cpp index 708919928..21338dae3 100644 --- a/radio/src/targets/nv14/bootloader/boot_menu.cpp +++ b/radio/src/targets/nv14/bootloader/boot_menu.cpp @@ -34,7 +34,7 @@ const uint8_t LBM_OK[] = { void bootloaderInitScreen() { lcdColorTable[DEFAULT_COLOR_INDEX] = BLACK; - lcdColorTable[TEXT_BGCOLOR_INDEX] = WHITE; + lcdColorTable[DEFAULT_BGCOLOR_INDEX] = WHITE; lcdColorTable[LINE_COLOR_INDEX] = RED; lcdColorTable[BARGRAPH1_COLOR_INDEX] = RED; lcdColorTable[BARGRAPH2_COLOR_INDEX] = RGB(73, 219, 62); // green @@ -56,7 +56,7 @@ static void bootloaderDrawFooter() void bootloaderDrawScreen(BootloaderState st, int opt, const char* str) { // clear screen - lcdDrawSolidFilledRect(0, 0, LCD_W-1, LCD_H-1, TEXT_BGCOLOR); + lcdDrawSolidFilledRect(0, 0, LCD_W-1, LCD_H-1, DEFAULT_BGCOLOR); if (st == ST_START) { diff --git a/radio/src/targets/nv14/libopenui_config.h b/radio/src/targets/nv14/libopenui_config.h index c446c5d92..dff0e0048 100644 --- a/radio/src/targets/nv14/libopenui_config.h +++ b/radio/src/targets/nv14/libopenui_config.h @@ -90,7 +90,7 @@ constexpr uint32_t ALERT_BUTTON_TOP = 300; enum LcdColorIndex { DEFAULT_COLOR_INDEX, - TEXT_BGCOLOR_INDEX, + DEFAULT_BGCOLOR_INDEX, FOCUS_COLOR_INDEX, FOCUS_BGCOLOR_INDEX, TEXT_STATUSBAR_COLOR_INDEX, diff --git a/radio/src/tests/lcd_480x272.cpp b/radio/src/tests/lcd_480x272.cpp index a85e5fafb..0362698e7 100644 --- a/radio/src/tests/lcd_480x272.cpp +++ b/radio/src/tests/lcd_480x272.cpp @@ -83,7 +83,7 @@ bool checkScreenshot_colorlcd(const QString & test) TEST(Lcd_colorlcd, vline) { loadFonts(); - lcd->clear(TEXT_BGCOLOR); + lcd->clear(DEFAULT_BGCOLOR); for (int x=0; x<100; x+=2) { lcdDrawSolidVerticalLine(x, x/2, 12, DEFAULT_COLOR); } @@ -93,7 +93,7 @@ TEST(Lcd_colorlcd, vline) TEST(Lcd_colorlcd, primitives) { loadFonts(); - lcd->clear(TEXT_BGCOLOR); + lcd->clear(DEFAULT_BGCOLOR); lcdDrawText(8, 8, "The quick brown fox jumps over the lazy dog", DISABLE_COLOR); lcdDrawText(5, 5, "The quick brown fox jumps over the lazy dog", DEFAULT_COLOR); @@ -121,7 +121,7 @@ TEST(Lcd_colorlcd, primitives) TEST(Lcd_colorlcd, transparency) { loadFonts(); - lcd->clear(TEXT_BGCOLOR); + lcd->clear(DEFAULT_BGCOLOR); lcdDrawText(8, 8, "The quick brown fox jumps over the lazy dog", DEFAULT_COLOR|OPACITY(4)); lcdDrawText(5, 5, "The quick brown fox jumps over the lazy dog", DEFAULT_COLOR|OPACITY(12)); @@ -158,7 +158,7 @@ TEST(Lcd_colorlcd, transparency) TEST(Lcd_colorlcd, fonts) { loadFonts(); - lcd->clear(TEXT_BGCOLOR); + lcd->clear(DEFAULT_BGCOLOR); lcdDrawText(8, 8, "The quick brown fox jumps over the lazy dog", DEFAULT_COLOR|OPACITY(4)); lcdDrawText(5, 5, "The quick brown fox jumps over the lazy dog", DEFAULT_COLOR|OPACITY(12));