From 8dfa4677318947220abac56c576e1a44f09b7ed6 Mon Sep 17 00:00:00 2001 From: philmoz Date: Sun, 28 Apr 2024 15:00:45 +1000 Subject: [PATCH] fix(color): mixes list view not resizing when mixer monitors enabled (#4931) --- radio/src/gui/colorlcd/list_line_button.h | 2 +- radio/src/gui/colorlcd/model_mixes.cpp | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/colorlcd/list_line_button.h b/radio/src/gui/colorlcd/list_line_button.h index 6261c4ec9..b649b856f 100644 --- a/radio/src/gui/colorlcd/list_line_button.h +++ b/radio/src/gui/colorlcd/list_line_button.h @@ -77,7 +77,7 @@ class InputMixGroupBase : public Window mixsrc_t getMixSrc() { return idx; } size_t getLineCount() { return lines.size(); } - void adjustHeight(); + virtual void adjustHeight(); void addLine(InputMixButtonBase* line); bool removeLine(InputMixButtonBase* line); diff --git a/radio/src/gui/colorlcd/model_mixes.cpp b/radio/src/gui/colorlcd/model_mixes.cpp index eb913d48a..8cc086656 100644 --- a/radio/src/gui/colorlcd/model_mixes.cpp +++ b/radio/src/gui/colorlcd/model_mixes.cpp @@ -205,6 +205,17 @@ class MixGroup : public InputMixGroupBase adjustHeight(); } + void adjustHeight() override + { + coord_t y = monitorVisible ? 17 : 2; + for (auto it = lines.cbegin(); it != lines.cend(); ++it) { + auto line = *it; + line->updatePos(LN_X, y); + y += line->height() + 2; + } + setHeight(y + 4); + } + protected: MixerChannelBar* monitor = nullptr; bool monitorVisible = false;