Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-08-02 02:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(ui): scroll indicator in fullscreen message view

Browse Source 
Replace the old ^/v scroll arrows with the proportional scroll indicator
(thumb + triangle caps) used by the list screens. Reserve its right-edge
column and re-wrap the message text to the narrower width so nothing renders
under it.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-06-15 17:30:43 +02:00
co-authored by Claude Opus 4.8
parent 353dee5878
commit a0d536cf90
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/ui-new/FullscreenMsgView.h
+8 -14
View File
@@ -2,6 +2,7 @@
#include <helpers/ui/DisplayDriver.h> #include <helpers/ui/DisplayDriver.h>
#include <Arduino.h> #include <Arduino.h>
#include "icons.h"
static const int FS_CHARS_MAX = 80; // max bytes per wrapped line static const int FS_CHARS_MAX = 80; // max bytes per wrapped line
@@ -103,6 +104,12 @@ struct FullscreenMsgView {
display.translateUTF8ToBlocks(trans_text, body, sizeof(trans_text)); display.translateUTF8ToBlocks(trans_text, body, sizeof(trans_text));
char lines[12][FS_CHARS_MAX]; char lines[12][FS_CHARS_MAX];
int lcount = wrapLines(display, trans_text, max_px, lines, 12); int lcount = wrapLines(display, trans_text, max_px, lines, 12);
// Reserve the right-edge column for the scroll indicator and re-wrap so text
// can't run under it. Reserve appears only once the list overflows, and a
// narrower second pass only ever yields more lines — so it stays overflowing.
int reserve = scrollIndicatorReserve(display, lcount, visible);
if (reserve > 0)
lcount = wrapLines(display, trans_text, max_px - reserve, lines, 12);
int max_scroll = lcount > visible ? lcount - visible : 0; int max_scroll = lcount > visible ? lcount - visible : 0;
if (scroll > max_scroll) scroll = max_scroll; if (scroll > max_scroll) scroll = max_scroll;
@@ -110,20 +117,7 @@ struct FullscreenMsgView {
display.setCursor(0, startY + i * lineH); display.setCursor(0, startY + i * lineH);
display.print(lines[scroll + i]); display.print(lines[scroll + i]);
} }
if (scroll > 0) { drawScrollIndicator(display, startY, visible * lineH, lcount, visible, scroll);
display.setColor(DisplayDriver::DARK);
display.fillRect(display.width() - cw, startY, cw, lineH);
display.setColor(DisplayDriver::LIGHT);
display.setCursor(display.width() - cw, startY);
display.print("^");
}
if (scroll < max_scroll) {
display.setColor(DisplayDriver::DARK);
display.fillRect(display.width() - cw, startY + (visible - 1) * lineH, cw, lineH);
display.setColor(DisplayDriver::LIGHT);
display.setCursor(display.width() - cw, startY + (visible - 1) * lineH);
display.print("v");
}
const int nav_y = display.height() - lineH; const int nav_y = display.height() - lineH;
if (has_next) { if (has_next) {
display.setCursor(0, nav_y); display.setCursor(0, nav_y);