From 91630a02f71a01d96ceec6a35213c04e292651fa Mon Sep 17 00:00:00 2001 From: philmoz Date: Fri, 22 Mar 2024 21:43:03 +1100 Subject: [PATCH] fix(bw): pot/slider bars can overlap on main view (#4787) --- radio/src/gui/128x64/view_main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/128x64/view_main.cpp b/radio/src/gui/128x64/view_main.cpp index df95acf91..22ab10f8b 100644 --- a/radio/src/gui/128x64/view_main.cpp +++ b/radio/src/gui/128x64/view_main.cpp @@ -114,9 +114,9 @@ void drawPotsBars() for (uint8_t i = 0; i < max_pots; i++) { if (IS_POT_SLIDER_AVAILABLE(i)) { coord_t x = xstart + (i % cols) * 5; - coord_t y = lines == 1 ? (LCD_H - 8) : i >= cols ? (LCD_H - 8) : (LCD_H - 8 - BAR_HEIGHT / 2); + coord_t y = lines == 1 ? (LCD_H - 8) : i >= cols ? (LCD_H - 8) : (LCD_H - 8 - BAR_HEIGHT / 2 - 1); auto v = calibratedAnalogs[offset + i] + RESX; - uint8_t len = (v * BAR_HEIGHT / (RESX * 2 * lines)) + 1l; + uint8_t len = (v * (BAR_HEIGHT - (lines - 1)) / (RESX * 2 * lines)) + 1l; V_BAR(x, y, len); } }