From fa5dea63adfc4b7d27bcdff585c1b3ea891ffef7 Mon Sep 17 00:00:00 2001 From: philmoz Date: Sat, 25 Jan 2025 12:39:34 +1100 Subject: [PATCH] fix(color): setup dialog for pots on portrait LCD has overlapping text (#5825) --- radio/src/gui/colorlcd/radio/hw_inputs.cpp | 2 +- radio/src/gui/colorlcd/radio/hw_inputs.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/colorlcd/radio/hw_inputs.cpp b/radio/src/gui/colorlcd/radio/hw_inputs.cpp index 56ae449a9..888fe8db1 100644 --- a/radio/src/gui/colorlcd/radio/hw_inputs.cpp +++ b/radio/src/gui/colorlcd/radio/hw_inputs.cpp @@ -136,7 +136,7 @@ HWPots::HWPots(Window* parent) : pot->setAvailableHandler([=](int val) { return isPotTypeAvailable(val); }); auto tgl = new ToggleSwitch( - this, rect_t{P_INV_X, P_Y(i) + P_OFST_Y + yo, P_INV_W, 0}, + this, rect_t{P_INV_X, P_Y(i) + yo, P_INV_W, 0}, [=]() -> uint8_t { return (uint8_t)getPotInversion(i); }, [=](int8_t newValue) { setPotInversion(i, newValue); diff --git a/radio/src/gui/colorlcd/radio/hw_inputs.h b/radio/src/gui/colorlcd/radio/hw_inputs.h index 70fe96a9f..b9dd4f98e 100644 --- a/radio/src/gui/colorlcd/radio/hw_inputs.h +++ b/radio/src/gui/colorlcd/radio/hw_inputs.h @@ -43,11 +43,11 @@ struct HWPots : public Window // in a flex layout static LAYOUT_VAL(P_LBL_X, 0, 0) static LAYOUT_VAL(P_LBL_W, (DIALOG_DEFAULT_WIDTH - 45) * 2 / 11, (DIALOG_DEFAULT_WIDTH - 18) * 13 / 21) - static constexpr coord_t P_NM_X = P_LBL_X + P_LBL_W + PAD_MEDIUM; + static LAYOUT_VAL(P_NM_X, P_LBL_X + P_LBL_W + PAD_MEDIUM, 100); static LAYOUT_VAL(P_NM_W, 70, 70) - static LAYOUT_VAL(P_TYP_X, P_NM_X + P_NM_W, 0) + static LAYOUT_VAL(P_TYP_X, P_NM_X + P_NM_W, 32) static LAYOUT_VAL(P_TYP_W, 160, P_LBL_W) - static constexpr coord_t P_INV_X = P_TYP_X + P_TYP_W + PAD_MEDIUM; + static LAYOUT_VAL(P_INV_X, P_TYP_X + P_TYP_W + PAD_MEDIUM, P_NM_X + P_NM_W + PAD_MEDIUM) static LAYOUT_VAL(P_INV_W, 52, 52) static LAYOUT_VAL(P_ROW_H, 36, 72) static LAYOUT_VAL(P_OFST_Y, 0, 36)