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

feat(ui): proportional scrollbar with mini-icon caps; reclaim row space

Browse Source 
Replace the text ^/v scroll arrows with a font-scaling indicator drawn in
icons.h: a proportional thumb between fixed up/down triangle mini-icon caps.
drawScrollIndicator() lives in a ~5px right-edge column and scales via
miniIconScale (1x OLED, 2x landscape e-ink).

- Mini-icons: ICON_SCROLL_UP/DOWN; miniIconDrawTop (exact placement) and
  miniIconDrawHalo (shape-hugging 1px DARK halo, clip_top to spare the header
  separator) so caps stay visible on the LIGHT selection bar without a box.
- Thumb is 3*s wide so it centres on the triangle column; caps are static end
  markers (always drawn) so neither vanishes at the extremes.
- scrollIndicatorReserve(): right-edge gutter (0 when the list fits). Content,
  the selection bar and the message-history bubbles are all narrowed by it so
  nothing renders under the scrollbar. Portrait e-ink wrap width subtracts the
  reserve in both the box-height pass and render so wrapped text can't spill.
- Drop the redundant ">" selection marker (the highlight bar already shows
  selection) and shift rows to x=2, reclaiming left-edge space.
- Wire the indicator into every scrollable list (Bot, Settings, Nearby, Tools,
  Trail, QuickMsg lists + DM/channel history) and add one to WaypointsView,
  which scrolled with no indicator before.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
MarekZegare4
2026-06-15 14:41:46 +02:00
co-authored by Claude Opus 4.8
parent 8bd6fbf1cb
commit 6e4177f3d6
8 changed files with 177 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/ui-new/BotScreen.h
+6 -6
View File
@@ -71,6 +71,7 @@ public:
int val_x = display.valCol();
_visible = display.listVisible(item_h);
if (_visible < 1) _visible = 1;
int reserve = scrollIndicatorReserve(display, ITEM_COUNT, _visible);
display.drawTextCentered(display.width() / 2, 0, "AUTO-REPLY BOT");
// reply counter, right-aligned in the header
@@ -91,7 +92,7 @@ public:
int i = _scroll + vi;
int y = start_y + vi * item_h;
bool sel = (i == _sel);
display.drawSelectionRow(0, y - 1, display.width(), item_h, sel);
display.drawSelectionRow(0, y - 1, display.width() - reserve, item_h, sel);
display.setCursor(2, y);
display.print(labels[i]);
display.setCursor(val_x, y);
@@ -104,7 +105,7 @@ public:
} else {
ChannelDetails ch;
if (the_mesh.getChannel(_prefs->bot_channel_idx, ch) && ch.name[0])
display.drawTextEllipsized(val_x, y, display.width() - val_x - 1, ch.name);
display.drawTextEllipsized(val_x, y, display.width() - val_x - 1 - reserve,ch.name);
else
display.print("?");
}
@@ -113,10 +114,10 @@ public:
const char* shown = !tr[0] ? "(none)"
: (tr[0] == '*' && !tr[1]) ? "(any msg)" // wildcard / away mode
: tr;
display.drawTextEllipsized(val_x, y, display.width() - val_x - 1, shown);
display.drawTextEllipsized(val_x, y, display.width() - val_x - 1 - reserve,shown);
} else if (i == 3 || i == 5) {
const char* rp = (i == 3) ? _prefs->bot_reply_dm : _prefs->bot_reply_ch;
display.drawTextEllipsized(val_x, y, display.width() - val_x - 1, rp[0] ? rp : "(none)");
display.drawTextEllipsized(val_x, y, display.width() - val_x - 1 - reserve,rp[0] ? rp : "(none)");
} else if (i == 6) {
display.print(_prefs->bot_commands_enabled ? "ON" : "OFF");
} else { // i == 7 (quiet from) or i == 8 (quiet to)
@@ -131,8 +132,7 @@ public:
}
display.setColor(DisplayDriver::LIGHT);
}
display.drawScrollArrows(start_y, start_y + (_visible - 1) * item_h,
_scroll > 0, _scroll + _visible < ITEM_COUNT);
drawScrollIndicator(display, start_y, _visible * item_h, ITEM_COUNT, _visible, _scroll);
return 2000;
}