diff --git a/radio/src/gui/colorlcd/model_flightmodes.cpp b/radio/src/gui/colorlcd/model_flightmodes.cpp index ec846b0a0..5efd82bd6 100644 --- a/radio/src/gui/colorlcd/model_flightmodes.cpp +++ b/radio/src/gui/colorlcd/model_flightmodes.cpp @@ -124,8 +124,7 @@ struct FMTrimSettings : public Dialog { SET_DIRTY(); return 0; } - }, - 0, COLOR_THEME_PRIMARY1); + }); if (tr->mode != TRIM_MODE_NONE) btn->check(); btn->setWidth(LV_DPI_DEF / 2); diff --git a/radio/src/gui/colorlcd/model_select.cpp b/radio/src/gui/colorlcd/model_select.cpp index 4fe446a29..d45464e2a 100644 --- a/radio/src/gui/colorlcd/model_select.cpp +++ b/radio/src/gui/colorlcd/model_select.cpp @@ -61,7 +61,6 @@ constexpr int BUTTONS_HEIGHT = 30; constexpr int MODEL_CELLS_PER_LINE = 2; #if LCD_W > LCD_H // Landscape -constexpr LcdFlags textFont = FONT(STD); constexpr int LABELS_WIDTH = 132; constexpr int LAY_MARGIN = 5; constexpr coord_t MODEL_SELECT_CELL_WIDTH = @@ -69,7 +68,6 @@ constexpr coord_t MODEL_SELECT_CELL_WIDTH = (MODEL_CELLS_PER_LINE + 1) * MODEL_CELL_PADDING) / MODEL_CELLS_PER_LINE; #else // Portrait -constexpr LcdFlags textFont = FONT(XS); constexpr int LAY_MARGIN = 8; constexpr int LABELS_HEIGHT = 140; constexpr coord_t MODEL_SELECT_CELL_WIDTH = @@ -147,18 +145,17 @@ class ButtonHolder : public FormWindow addButton(mask_sort_date_up, mask_sort_date_down); // New label button - auto btn = new TextButton( - this, rect_t{}, + auto btn = new TextButton(this, rect_t{}, #if LCD_W > LCD_H - STR_NEW, + STR_NEW, #else - STR_NEW_LABEL, + STR_NEW_LABEL, #endif - [=]() { - if(_newLabelHandler) _newLabelHandler(); - return 0; - }, - BUTTON_BACKGROUND | OPAQUE, textFont); + [=]() { + if (_newLabelHandler) _newLabelHandler(); + return 0; + }); + btn->padAll(lv_dpx(4)); lv_obj_align(btn->getLvObj(), LV_ALIGN_RIGHT_MID, 0, 0); @@ -524,8 +521,7 @@ class LabelDialog : public Dialog if (saveHandler != nullptr) saveHandler(label); deleteLater(); return 0; - }, - BUTTON_BACKGROUND | OPAQUE, textFont); + }); btn->setWidth(LV_DPI_DEF); btn = new TextButton( @@ -533,8 +529,7 @@ class LabelDialog : public Dialog [=]() { deleteLater(); return 0; - }, - BUTTON_BACKGROUND | OPAQUE, textFont); + }); btn->setWidth(LV_DPI_DEF); content->setWidth(LCD_W * 0.8); @@ -658,13 +653,10 @@ void ModelLabelsWindow::buildHead(PageHeader *hdr) setTitle(); // new model button - auto btn = new TextButton( - hdr, rect_t{}, STR_NEW_MODEL, - [=]() { - newModel(); - return 0; - }, - BUTTON_BACKGROUND | OPAQUE, textFont); + auto btn = new TextButton(hdr, rect_t{}, STR_NEW_MODEL, [=]() { + newModel(); + return 0; + }); btn->padAll(lv_dpx(4)); diff --git a/radio/src/gui/colorlcd/preview_window.h b/radio/src/gui/colorlcd/preview_window.h index 40702acb8..a4914b1f3 100644 --- a/radio/src/gui/colorlcd/preview_window.h +++ b/radio/src/gui/colorlcd/preview_window.h @@ -149,10 +149,11 @@ class ThemedButton : public TextButton public: ThemedButton(FormGroup *window, const rect_t &rect, std::string text, bool isChecked, WindowFlags windowFlags, LcdColorIndex colorIndex) : - TextButton(window, rect, text, nullptr, windowFlags | NO_FOCUS, COLOR(colorIndex)), + TextButton(window, rect, text, nullptr, windowFlags | NO_FOCUS), _colorIndex(colorIndex), _isChecked(isChecked) { + setTextFlags(COLOR(colorIndex)); setPressHandler([=] () { return _isChecked; }); } diff --git a/radio/src/gui/colorlcd/radio_theme.cpp b/radio/src/gui/colorlcd/radio_theme.cpp index c8820fc6e..eda19cab3 100644 --- a/radio/src/gui/colorlcd/radio_theme.cpp +++ b/radio/src/gui/colorlcd/radio_theme.cpp @@ -59,7 +59,6 @@ #if (LCD_W > LCD_H) constexpr int BUTTON_HEIGHT = 30; constexpr int BUTTON_WIDTH = 75; -constexpr LcdFlags textFont = FONT(STD); constexpr rect_t detailsDialogRect = {50, 50, 400, 170}; constexpr int labelWidth = 150; @@ -69,7 +68,6 @@ constexpr int COLOR_BOX_HEIGHT = 27; #else constexpr int BUTTON_HEIGHT = 30; constexpr int BUTTON_WIDTH = 65; -constexpr LcdFlags textFont = FONT(XS); constexpr rect_t detailsDialogRect = {5, 50, LCD_W - 10, 340}; constexpr int labelWidth = 120; @@ -112,12 +110,12 @@ class ThemeDetailsDialog: public Dialog saveHandler(this->theme); deleteLater(); return 0; - }, BUTTON_BACKGROUND | OPAQUE, textFont); + }); r.x -= (BUTTON_WIDTH + 5); new TextButton(&content->form, r, STR_CANCEL, [=] () { deleteLater(); return 0; - }, BUTTON_BACKGROUND | OPAQUE, textFont); + }); } protected: @@ -270,16 +268,14 @@ protected: [=] () { setActiveColorBar(0); return 1; - }, - 0, COLOR_THEME_PRIMARY1)); + })); r.x += (BUTTON_WIDTH + 5); _tabs.emplace_back( new TextButton(window, r, "HSV", [=] () { setActiveColorBar(1); return 1; - }, - 0, COLOR_THEME_PRIMARY1)); + })); _tabs[1]->check(true); } }; @@ -352,7 +348,7 @@ class ThemeEditPage : public Page _dirty = true; }); return 0; - }, BUTTON_BACKGROUND | OPAQUE, textFont); + }); } void buildBody(FormGroup *window) diff --git a/radio/src/gui/colorlcd/themes/etx_lv_theme.cpp b/radio/src/gui/colorlcd/themes/etx_lv_theme.cpp index b8b1088fa..7cac897f6 100644 --- a/radio/src/gui/colorlcd/themes/etx_lv_theme.cpp +++ b/radio/src/gui/colorlcd/themes/etx_lv_theme.cpp @@ -296,12 +296,12 @@ static void style_init(void) : lv_disp_dpx(theme.disp, 8))); lv_style_set_bg_opa(&styles.btn, LV_OPA_COVER); - lv_style_set_bg_color(&styles.btn, makeLvColor(COLOR_THEME_SECONDARY2)); + lv_style_set_bg_color(&styles.btn, makeLvColor(COLOR_THEME_PRIMARY2)); lv_style_set_border_opa(&styles.btn, LV_OPA_0); lv_style_set_border_width(&styles.btn, BORDER_WIDTH); - lv_style_set_text_color(&styles.btn, color_text); + lv_style_set_text_color(&styles.btn, makeLvColor(COLOR_THEME_SECONDARY1)); lv_style_set_pad_hor(&styles.btn, PAD_SMALL); lv_style_set_pad_ver(&styles.btn, PAD_SMALL); lv_style_set_pad_column(&styles.btn, lv_disp_dpx(theme.disp, 5)); diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index e3f6e2d12..2ccef5198 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit e3f6e2d12e007600e907a000816f546482fcb716 +Subproject commit 2ccef5198aeb75295f1eb3d0c725bc91872ff7b9