From e5591839de50fb3e1bb6017a5d8a4fc68e76e8e2 Mon Sep 17 00:00:00 2001 From: philmoz Date: Sun, 18 May 2025 20:34:30 +1000 Subject: [PATCH] fix(color): channel monitor bars too wide, clip right edge (#6272) --- radio/src/gui/colorlcd/controls/channel_bar.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/colorlcd/controls/channel_bar.cpp b/radio/src/gui/colorlcd/controls/channel_bar.cpp index 793270e61..d3e2e6c2b 100644 --- a/radio/src/gui/colorlcd/controls/channel_bar.cpp +++ b/radio/src/gui/colorlcd/controls/channel_bar.cpp @@ -227,13 +227,15 @@ ComboChannelBar::ComboChannelBar(Window* parent, const rect_t& rect, auto invMask = getBuiltinIcon(ICON_CHAN_MONITOR_INVERTED); + coord_t barW = width() - invMask->width - PAD_TINY; + outputChannelBar = new OutputChannelBar( - this, {PAD_TINY + invMask->width, ChannelBar::BAR_HEIGHT + PAD_TINY, width() - PAD_TINY, ChannelBar::BAR_HEIGHT}, + this, {PAD_TINY + invMask->width, ChannelBar::BAR_HEIGHT + PAD_TINY, barW, ChannelBar::BAR_HEIGHT}, channel, isInHeader); new MixerChannelBar( this, - {PAD_TINY + invMask->width, (2 * ChannelBar::BAR_HEIGHT) + PAD_TINY + 1, width() - PAD_TINY, ChannelBar::BAR_HEIGHT}, + {PAD_TINY + invMask->width, (2 * ChannelBar::BAR_HEIGHT) + PAD_TINY + 1, barW, ChannelBar::BAR_HEIGHT}, channel); // Channel number