From cdbc62c5590663641522e741fd3b2dd381012e82 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Thu, 15 Jul 2021 10:46:44 +0200 Subject: [PATCH] [color] clip trim value displayed based on range set. Resolves #443 --- radio/src/gui/colorlcd/layouts/trims.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/colorlcd/layouts/trims.cpp b/radio/src/gui/colorlcd/layouts/trims.cpp index f164b6968..07cbebc07 100644 --- a/radio/src/gui/colorlcd/layouts/trims.cpp +++ b/radio/src/gui/colorlcd/layouts/trims.cpp @@ -43,6 +43,10 @@ void MainViewHorizontalTrim::paint(BitmapBuffer * dc) trimMin = TRIM_MIN; trimMax = TRIM_MAX; } + + int16_t dispVal = value; + if (dispVal < trimMin) dispVal = trimMin; + if (dispVal > trimMax) dispVal = trimMax; // Trim line dc->drawSolidFilledRect( @@ -50,7 +54,7 @@ void MainViewHorizontalTrim::paint(BitmapBuffer * dc) width() - TRIM_SQUARE_SIZE + 1, TRIM_LINE_WIDTH, DEFAULT_COLOR); // Trim square - coord_t x = divRoundClosest((width() - TRIM_SQUARE_SIZE) * (value - trimMin), + coord_t x = divRoundClosest((width() - TRIM_SQUARE_SIZE) * (dispVal - trimMin), trimMax - trimMin); drawTrimSquare(dc, x, 0, (value < TRIM_MIN || value > TRIM_MAX)