Skip to content

Refine graphical renderer parity #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
forntoh merged 1 commit into from
May 18, 2026
Merged

Refine graphical renderer parity #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions src/renderer/GraphicalDisplayRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,30 @@ GraphicalDisplayRenderer::GraphicalDisplayRenderer(
: MenuRenderer(display, 0, 0),
gDisplay(display),
defaultFont(defaultFont),
cursorIcon(cursorIcon == NULL ? ">" : cursorIcon),
editCursorIcon(editCursorIcon == NULL ? "*" : editCursorIcon) {}
cursorIcon(cursorIcon),
editCursorIcon(editCursorIcon) {}

void GraphicalDisplayRenderer::setDefaultFont(const uint8_t* font) {
defaultFont = font;

if (defaultFont != NULL) {
gDisplay->setFont(defaultFont);
}
captureCurrentFontMetrics();

applyItemFont(activeItem);
}

bool GraphicalDisplayRenderer::setItemFont(MenuItem* item, const uint8_t* font) {
if (!::setItemFont(item, font)) {
return false;
}

if (font != NULL) {
gDisplay->setFont(font);
captureCurrentFontMetrics();
}

applyItemFont(activeItem);
return true;
}
Expand Down Expand Up @@ -98,9 +110,16 @@ void GraphicalDisplayRenderer::applyItemFont(const MenuItem* item) {

void GraphicalDisplayRenderer::begin() {
MenuRenderer::begin();

maxRowHeight = 8;
maxFontWidth = 1;
applyItemFont(NULL);

if (defaultFont != NULL) {
gDisplay->setFont(defaultFont);
}
captureCurrentFontMetrics();
applyItemFont(activeItem);

beginFrame();
endFrame();
}
Expand Down Expand Up @@ -318,11 +337,14 @@ void GraphicalDisplayRenderer::drawSubMenuIndicator() {
uint8_t contentRight = gDisplay->getDisplayWidth() > rightInset ? gDisplay->getDisplayWidth() - rightInset : gDisplay->getDisplayWidth();
uint8_t x = contentRight > rightPadding + submenuGlyphWidth ? contentRight - rightPadding - submenuGlyphWidth : leftPadding;
uint8_t y = top + (h > submenuGlyphHeight ? (h - submenuGlyphHeight) / 2 : 0);

gDisplay->setDrawColor(hasFocus && !MenuItem::isEditing() ? 0 : 1);
gDisplay->drawBox(x, y, 1, 1);
gDisplay->drawBox(x, y + 1, 2, 1);
gDisplay->drawBox(x, y + 2, 3, 1);
gDisplay->drawBox(x, y + 3, 2, 1);
gDisplay->drawBox(x, y + 4, 1, 1);
gDisplay->setDrawColor(1);
}

void GraphicalDisplayRenderer::drawListIndicator() {
Expand All @@ -332,7 +354,10 @@ void GraphicalDisplayRenderer::drawListIndicator() {
uint8_t contentRight = gDisplay->getDisplayWidth() > rightInset ? gDisplay->getDisplayWidth() - rightInset : gDisplay->getDisplayWidth();
uint8_t x = contentRight > rightPadding + listGlyphWidth ? contentRight - rightPadding - listGlyphWidth : leftPadding;
uint8_t y = top + (h > listGlyphHeight ? (h - listGlyphHeight) / 2 : 0);

gDisplay->setDrawColor(hasFocus && !MenuItem::isEditing() ? 0 : 1);
gDisplay->drawXbm(x, y, listGlyphWidth, listGlyphHeight, listGlyph);
gDisplay->setDrawColor(1);
}

uint8_t GraphicalDisplayRenderer::measureText(const char* text) const {
Expand All @@ -348,7 +373,7 @@ uint8_t GraphicalDisplayRenderer::toggleIndicatorWidth() const {
}

uint8_t GraphicalDisplayRenderer::rowHeight() const {
return maxRowHeight == 0 ? 8 : maxRowHeight + 2;
return maxRowHeight == 0 ? 8 : maxRowHeight;
}

uint8_t GraphicalDisplayRenderer::getMaxRows() const {
Expand Down
65 changes: 62 additions & 3 deletions test/GraphicalDisplayRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@

class StubGraphicalDisplay : public GraphicalDisplayInterface {
public:
uint8_t drawBoxCount = 0;
uint8_t drawXbmCount = 0;
uint8_t drawColorCount = 0;
uint8_t drawColors[4] = {0, 0, 0, 0};
uint8_t lastDrawBoxHeight = 0;

void begin() override {}
void clear() override {}
void show() override {}
Expand All @@ -29,12 +35,31 @@ class StubGraphicalDisplay : public GraphicalDisplayInterface {
}
return static_cast<uint8_t>(len * 6);
}
void setDrawColor(uint8_t) override {}
void setDrawColor(uint8_t color) override {
if (drawColorCount < 4) {
drawColors[drawColorCount] = color;
}
drawColorCount++;
}
void clearBuffer() override {}
void sendBuffer() override {}
void drawBox(uint8_t, uint8_t, uint8_t, uint8_t) override {}
void drawBox(uint8_t, uint8_t, uint8_t, uint8_t h) override {
drawBoxCount++;
lastDrawBoxHeight = h;
}
void drawFrame(uint8_t, uint8_t, uint8_t, uint8_t) override {}
void drawXbm(uint8_t, uint8_t, uint8_t, uint8_t, const uint8_t*) override {}
void drawXbm(uint8_t, uint8_t, uint8_t, uint8_t, const uint8_t*) override {
drawXbmCount++;
}
};

class FocusableGraphicalDisplayRenderer : public GraphicalDisplayRenderer {
public:
using GraphicalDisplayRenderer::GraphicalDisplayRenderer;

void setFocusForTest(bool focused) {
hasFocus = focused;
}
};

unittest(graphical_renderer_exposes_value_selection_extension) {
Expand All @@ -49,4 +74,38 @@ unittest(graphical_renderer_exposes_value_selection_extension) {
selection->clearValueSelection();
}

unittest(graphical_renderer_uses_tight_row_height) {
StubGraphicalDisplay display;
GraphicalDisplayRenderer renderer(&display);

renderer.drawItem("Label", NULL);

assertEqual(1, display.drawBoxCount);
assertEqual(8, display.lastDrawBoxHeight);
}

unittest(graphical_renderer_colors_indicators_when_focused) {
StubGraphicalDisplay display;
FocusableGraphicalDisplayRenderer renderer(&display);

renderer.setFocusForTest(true);
renderer.drawListIndicator();

assertEqual(2, display.drawColorCount);
assertEqual(0, display.drawColors[0]);
assertEqual(1, display.drawColors[1]);
assertEqual(1, display.drawXbmCount);

display.drawColorCount = 0;
display.drawXbmCount = 0;
display.drawBoxCount = 0;

renderer.drawSubMenuIndicator();

assertEqual(2, display.drawColorCount);
assertEqual(0, display.drawColors[0]);
assertEqual(1, display.drawColors[1]);
assertEqual(5, display.drawBoxCount);
}

unittest_main()
Loading