diff --git a/radio/src/gui/colorlcd/gvar_numberedit.h b/radio/src/gui/colorlcd/gvar_numberedit.h index 5a7ac7cba..ac3b3e833 100644 --- a/radio/src/gui/colorlcd/gvar_numberedit.h +++ b/radio/src/gui/colorlcd/gvar_numberedit.h @@ -111,7 +111,7 @@ class GVarNumberEdit: public FormGroup new TextButton(this, {width() - GVAR_BUTTON_WIDTH, 0, GVAR_BUTTON_WIDTH, height()}, STR_GV, [=]() { switchGVarMode(); return 0; - }, BUTTON_BACKGROUND | FORM_DETACHED); + }, BUTTON_BACKGROUND | OPAQUE | FORM_DETACHED); } }; #endif diff --git a/radio/src/gui/colorlcd/keyboard_curve.cpp b/radio/src/gui/colorlcd/keyboard_curve.cpp index dffdf1182..972b8e4f0 100644 --- a/radio/src/gui/colorlcd/keyboard_curve.cpp +++ b/radio/src/gui/colorlcd/keyboard_curve.cpp @@ -34,42 +34,42 @@ CurveKeyboard::CurveKeyboard() : [=]() -> uint8_t { putEvent(EVT_VIRTUAL_KEY_UP); return 0; - }, BUTTON_BACKGROUND | NO_FOCUS); + }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); // down new TextButton(this, {LCD_W / 2 - 20, 65, 40, 40}, "\201", [=]() -> uint8_t { putEvent(EVT_VIRTUAL_KEY_DOWN); return 0; - }, BUTTON_BACKGROUND | NO_FOCUS); + }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); // left left = new TextButton(this, {LCD_W / 2 - 70, 35, 40, 40}, "\177", [=]() -> uint8_t { putEvent(EVT_VIRTUAL_KEY_LEFT); return 0; - }, BUTTON_BACKGROUND | NO_FOCUS); + }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); // right right = new TextButton(this, {LCD_W / 2 + 30, 35, 40, 40}, "\176", [=]() -> uint8_t { putEvent(EVT_VIRTUAL_KEY_RIGHT); return 0; - }, BUTTON_BACKGROUND | NO_FOCUS); + }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); // next new TextButton(this, {LCD_W / 2 + 80, 35, 60, 40}, "Next", [=]() -> uint8_t { putEvent(EVT_VIRTUAL_KEY_NEXT); return 0; - }, BUTTON_BACKGROUND | NO_FOCUS); + }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); // previous new TextButton(this, {LCD_W / 2 - 140, 35, 60, 40}, "Prev", [=]() -> uint8_t { putEvent(EVT_VIRTUAL_KEY_PREVIOUS); return 0; - }, BUTTON_BACKGROUND | NO_FOCUS); + }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); } diff --git a/radio/src/gui/colorlcd/model_inputs.cpp b/radio/src/gui/colorlcd/model_inputs.cpp index 6f2a91c34..78596644d 100644 --- a/radio/src/gui/colorlcd/model_inputs.cpp +++ b/radio/src/gui/colorlcd/model_inputs.cpp @@ -278,12 +278,12 @@ class InputEditWindow: public Page if (i > 0 && (i % 4) == 0) grid.nextLine(); new TextButton(window, grid.getFieldSlot(4, i % 4), fm, - [=]() -> uint8_t { - BFBIT_FLIP(line->flightModes, bfBit(i)); - SET_DIRTY(); - return !(bfSingleBitGet(line->flightModes, i)); - }, - bfSingleBitGet(line->flightModes, i) ? 0 : BUTTON_CHECKED); + [=]() -> uint8_t { + BFBIT_FLIP(line->flightModes, bfBit(i)); + SET_DIRTY(); + return !(bfSingleBitGet(line->flightModes, i)); + }, + OPAQUE | (bfSingleBitGet(line->flightModes, i) ? 0 : BUTTON_CHECKED)); } grid.nextLine(); diff --git a/radio/src/gui/colorlcd/model_mixes.cpp b/radio/src/gui/colorlcd/model_mixes.cpp index dc80181b5..4bdc53bba 100644 --- a/radio/src/gui/colorlcd/model_mixes.cpp +++ b/radio/src/gui/colorlcd/model_mixes.cpp @@ -131,11 +131,11 @@ class MixEditWindow : public Page { grid.nextLine(); new TextButton(window, grid.getFieldSlot(4, i % 4), fm, [=]() -> uint8_t { - BFBIT_FLIP(mix->flightModes, bfBit(i)); - SET_DIRTY(); - return !(bfSingleBitGet(mix->flightModes, i)); + BFBIT_FLIP(mix->flightModes, bfBit(i)); + SET_DIRTY(); + return !(bfSingleBitGet(mix->flightModes, i)); }, - bfSingleBitGet(mix->flightModes, i) ? 0 : BUTTON_CHECKED); + OPAQUE | (bfSingleBitGet(mix->flightModes, i) ? 0 : BUTTON_CHECKED)); } grid.nextLine(); diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp index b0f916bcc..58ebebf43 100644 --- a/radio/src/gui/colorlcd/model_setup.cpp +++ b/radio/src/gui/colorlcd/model_setup.cpp @@ -343,7 +343,8 @@ void BindWaitDialog::checkEvents() Dialog::checkEvents(); } -class ReceiverButton: public TextButton { +class ReceiverButton: public TextButton +{ public: ReceiverButton(FormGroup * parent, rect_t rect, uint8_t moduleIdx, uint8_t receiverIdx): TextButton(parent, rect, STR_BIND, [=]() { @@ -1153,7 +1154,7 @@ void ModelSetupPage::build(FormWindow * window) if (j > 0 && (j % 3) == 0) switchesGrid.nextLine(); auto button = new TextButton(group, switchesGrid.getSlot(3, j % 3), switchWarninglabel(i), nullptr, - (bfGet(g_model.switchWarningState, 3 * i, 3) == 0 ? 0 : BUTTON_CHECKED)); + OPAQUE | (bfGet(g_model.switchWarningState, 3 * i, 3) == 0 ? 0 : BUTTON_CHECKED)); button->setPressHandler([button, i] { swarnstate_t newstate = bfGet(g_model.switchWarningState, 3 * i, 3); if (newstate == 1 && SWITCH_CONFIG(i) != SWITCH_3POS) @@ -1188,7 +1189,7 @@ void ModelSetupPage::build(FormWindow * window) SET_DIRTY(); return bfSingleBitGet(g_model.beepANACenter, i); }, - bfSingleBitGet(g_model.beepANACenter, i) ? BUTTON_CHECKED : 0); + OPAQUE | (bfSingleBitGet(g_model.beepANACenter, i) ? BUTTON_CHECKED : 0)); j++; } } diff --git a/radio/src/gui/colorlcd/radio_calibration.cpp b/radio/src/gui/colorlcd/radio_calibration.cpp index 207425f5e..13158f1d6 100644 --- a/radio/src/gui/colorlcd/radio_calibration.cpp +++ b/radio/src/gui/colorlcd/radio_calibration.cpp @@ -134,7 +134,7 @@ void RadioCalibrationPage::buildBody(FormWindow * window) [=]() -> uint8_t { nextStep(); return 0; - }, BUTTON_BACKGROUND | NO_FOCUS); + }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); #endif }