mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-08-01 17:56:12 +00:00
fix(ui): self-sizing popup menu, scaled for landscape e-ink
The popup menu used fixed pixel constants (box width, item height, text positions) sized for the OLED 128x64. On landscape e-ink the font is ~2x, so rows overlapped, text ran past the box edge, and the box never adapted to its contents. Rebuild render() from live font metrics: box width fits the widest title/item (clamped to the screen, centred), row height and title bar derive from the line height, items and title are ellipsized so nothing overflows, and the scroll arrows live in a reserved gutter. The title separator uses the scaled sepH() with a 2px gap before the first row so content no longer touches the line. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -7,10 +7,6 @@
|
|||||||
// Navigation wraps around: up from first item goes to last, and vice versa.
|
// Navigation wraps around: up from first item goes to last, and vice versa.
|
||||||
struct PopupMenu {
|
struct PopupMenu {
|
||||||
static const int PM_MAX_ITEMS = 16;
|
static const int PM_MAX_ITEMS = 16;
|
||||||
static const int PM_BX = 12;
|
|
||||||
static const int PM_BY = 10;
|
|
||||||
static const int PM_BW = 104;
|
|
||||||
static const int PM_ITEM_H = 10;
|
|
||||||
|
|
||||||
const char* _items[PM_MAX_ITEMS];
|
const char* _items[PM_MAX_ITEMS];
|
||||||
int _count;
|
int _count;
|
||||||
@@ -35,10 +31,22 @@ struct PopupMenu {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int render(DisplayDriver& display) {
|
int render(DisplayDriver& display) {
|
||||||
// Hard ceiling: never show more items than physically fit on screen.
|
// Everything is derived from the live font metrics so the box fits its
|
||||||
// On tall displays (portrait e-ink) this expands beyond _visible;
|
// content on every display — including landscape e-ink, where the font (and
|
||||||
// on small displays (OLED 64px) it clamps below _visible.
|
// line height) is ~2x the OLED. Fixed pixel constants used to clip the text
|
||||||
int max_by_height = (display.height() - PM_BY - 12) / PM_ITEM_H;
|
// and leave the box the wrong size there.
|
||||||
|
const int lh = display.getLineHeight();
|
||||||
|
const int cw = display.getCharWidth();
|
||||||
|
const int sh = display.sepH(); // separator thickness (2px landscape e-ink, else 1)
|
||||||
|
const int item_h = lh + 2; // row pitch
|
||||||
|
const int pad = 4; // inner left/right padding
|
||||||
|
const int margin = 4; // gap to the screen edge
|
||||||
|
const int gap = 2; // breathing room below the separator (matches listStart())
|
||||||
|
const int title_h = lh + 2 + sh + gap; // title text + scaled separator + gap
|
||||||
|
|
||||||
|
// Hard ceiling: never show more rows than physically fit on screen.
|
||||||
|
int avail_h = display.height() - margin * 2 - title_h - 2;
|
||||||
|
int max_by_height = avail_h / item_h;
|
||||||
if (max_by_height < 1) max_by_height = 1;
|
if (max_by_height < 1) max_by_height = 1;
|
||||||
_cap = max_by_height;
|
_cap = max_by_height;
|
||||||
int vis = (_count < _cap) ? _count : _cap;
|
int vis = (_count < _cap) ? _count : _cap;
|
||||||
@@ -52,33 +60,69 @@ struct PopupMenu {
|
|||||||
if (max_scroll < 0) max_scroll = 0;
|
if (max_scroll < 0) max_scroll = 0;
|
||||||
if (_scroll > max_scroll) _scroll = max_scroll;
|
if (_scroll > max_scroll) _scroll = max_scroll;
|
||||||
if (_scroll < 0) _scroll = 0;
|
if (_scroll < 0) _scroll = 0;
|
||||||
int bh = 12 + vis * PM_ITEM_H;
|
|
||||||
|
bool can_scroll = (_count > vis);
|
||||||
|
int arrow_w = can_scroll ? (cw + 2) : 0; // right gutter for ^/v markers
|
||||||
|
|
||||||
|
// Box width: widest of the title / all items, plus padding and the arrow
|
||||||
|
// gutter; clamped to the screen with a sane minimum.
|
||||||
|
int content_w = _title ? display.getTextWidth(_title) : 0;
|
||||||
|
for (int i = 0; i < _count; i++) {
|
||||||
|
int w = display.getTextWidth(_items[i]);
|
||||||
|
if (w > content_w) content_w = w;
|
||||||
|
}
|
||||||
|
int bw = content_w + pad * 2 + arrow_w;
|
||||||
|
int max_bw = display.width() - margin * 2;
|
||||||
|
if (bw > max_bw) bw = max_bw;
|
||||||
|
int min_bw = cw * 6 + pad * 2;
|
||||||
|
if (bw < min_bw) bw = min_bw;
|
||||||
|
if (bw > max_bw) bw = max_bw;
|
||||||
|
|
||||||
|
int bh = title_h + vis * item_h + 2;
|
||||||
|
|
||||||
|
// Centre on screen (clamped to the margins on small displays).
|
||||||
|
int bx = (display.width() - bw) / 2;
|
||||||
|
int by = (display.height() - bh) / 2;
|
||||||
|
if (bx < margin) bx = margin;
|
||||||
|
if (by < margin) by = margin;
|
||||||
|
|
||||||
display.setColor(DisplayDriver::DARK);
|
display.setColor(DisplayDriver::DARK);
|
||||||
display.fillRect(PM_BX, PM_BY, PM_BW, bh);
|
display.fillRect(bx, by, bw, bh);
|
||||||
display.setColor(DisplayDriver::LIGHT);
|
display.setColor(DisplayDriver::LIGHT);
|
||||||
display.drawRect(PM_BX, PM_BY, PM_BW, bh);
|
display.drawRect(bx, by, bw, bh);
|
||||||
display.setCursor(PM_BX + 4, PM_BY + 1);
|
if (_title) display.drawTextEllipsized(bx + pad, by + 1, bw - pad * 2, _title);
|
||||||
display.print(_title);
|
display.fillRect(bx, by + lh + 2, bw, sh); // separator just under the title; gap follows
|
||||||
display.fillRect(PM_BX, PM_BY + 10, PM_BW, 1);
|
|
||||||
|
|
||||||
if (_scroll > 0)
|
|
||||||
{ display.setCursor(PM_BX + PM_BW - 7, PM_BY + 1); display.print("^"); }
|
|
||||||
if (_scroll + vis < _count)
|
|
||||||
{ display.setCursor(PM_BX + PM_BW - 7, PM_BY + 2 + vis * PM_ITEM_H); display.print("v"); }
|
|
||||||
|
|
||||||
|
int list_y = by + title_h;
|
||||||
|
int text_w = bw - pad * 2 - arrow_w;
|
||||||
|
if (text_w < cw) text_w = cw;
|
||||||
for (int i = 0; i < vis && (_scroll + i) < _count; i++) {
|
for (int i = 0; i < vis && (_scroll + i) < _count; i++) {
|
||||||
int idx = _scroll + i;
|
int idx = _scroll + i;
|
||||||
int py = PM_BY + 12 + i * PM_ITEM_H;
|
int py = list_y + i * item_h + 1;
|
||||||
if (idx == _sel) {
|
if (idx == _sel) {
|
||||||
display.setColor(DisplayDriver::LIGHT);
|
display.setColor(DisplayDriver::LIGHT);
|
||||||
display.fillRect(PM_BX + 1, py - 1, PM_BW - 2, PM_ITEM_H);
|
display.fillRect(bx + 1, py - 1, bw - 2, item_h);
|
||||||
display.setColor(DisplayDriver::DARK);
|
display.setColor(DisplayDriver::DARK);
|
||||||
} else {
|
} else {
|
||||||
display.setColor(DisplayDriver::LIGHT);
|
display.setColor(DisplayDriver::LIGHT);
|
||||||
}
|
}
|
||||||
display.setCursor(PM_BX + 4, py);
|
display.drawTextEllipsized(bx + pad, py, text_w, _items[idx]);
|
||||||
display.print(_items[idx]);
|
display.setColor(DisplayDriver::LIGHT);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Scroll markers in the reserved gutter, drawn on top of their row and
|
||||||
|
// inverted on the selection bar so they stay visible.
|
||||||
|
if (can_scroll) {
|
||||||
|
int ax = bx + bw - arrow_w;
|
||||||
|
if (_scroll > 0) {
|
||||||
|
display.setColor(_scroll == _sel ? DisplayDriver::DARK : DisplayDriver::LIGHT);
|
||||||
|
display.setCursor(ax, list_y + 1); display.print("^");
|
||||||
|
}
|
||||||
|
if (_scroll + vis < _count) {
|
||||||
|
int last = _scroll + vis - 1;
|
||||||
|
display.setColor(last == _sel ? DisplayDriver::DARK : DisplayDriver::LIGHT);
|
||||||
|
display.setCursor(ax, list_y + (vis - 1) * item_h + 1); display.print("v");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
display.setColor(DisplayDriver::LIGHT);
|
display.setColor(DisplayDriver::LIGHT);
|
||||||
return 50;
|
return 50;
|
||||||
|
|||||||
Reference in New Issue
Block a user