cottongin/crosspoint-reader
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

refactor: simplify PopupLayout by removing unused progress bar attributes

Browse Source
This commit is contained in:
Arthur Tazhitdinov 2026-01-20 09:18:52 +05:00
parent 4bd7232948
commit 21304ec72d
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ScreenComponents.cpp
View File

@ -54,27 +54,27 @@ ScreenComponents::PopupLayout ScreenComponents::drawPopup(const GfxRenderer& ren
renderer.fillRect(x - 2, y - 2, w + 4, h + 4, true);
renderer.fillRect(x + 2, y + 2, w - 4, h - 4, false);
const int barWidth = POPUP_DEFAULT_MIN_WIDTH;
const int barHeight = POPUP_DEFAULT_BAR_HEIGHT;
const int barX = x + (w - barWidth) / 2;
const int barY = y + renderer.getLineHeight(UI_12_FONT_ID) + margin * 2 - 6;
const int textX = x + margin + (contentWidth - textWidth) / 2;
renderer.drawText(UI_12_FONT_ID, textX, y + margin, message, true, EpdFontFamily::BOLD);
renderer.displayBuffer();
return {x, y, w, h, barX, barY, barWidth, barHeight};
return {x, y, w, h};
}
void ScreenComponents::fillPopupProgress(const GfxRenderer& renderer, const PopupLayout& layout, const int progress) {
int fillWidth = layout.barWidth * progress / 100;
const int barWidth = POPUP_DEFAULT_MIN_WIDTH;
const int barHeight = POPUP_DEFAULT_BAR_HEIGHT;
const int barX = layout.x + (layout.width - barWidth) / 2;
const int barY = layout.y + layout.height - 16; // 16 pixels above bottom of popup
int fillWidth = barWidth * progress / 100;
if (fillWidth < 0) {
fillWidth = 0;
} else if (fillWidth > layout.barWidth) {
fillWidth = layout.barWidth;
} else if (fillWidth > barWidth) {
fillWidth = barWidth;
}
if (fillWidth > 2) {
renderer.fillRect(layout.barX + 1, layout.barY + 1, fillWidth - 2, layout.barHeight - 2, true);
renderer.fillRect(barX + 1, barY + 1, fillWidth - 2, barHeight - 2, true);
}
renderer.displayBuffer(EInkDisplay::FAST_REFRESH);
}

5
src/ScreenComponents.h
View File

@ -16,11 +16,6 @@ class ScreenComponents {
int y;
int width;
int height;
int barX;
int barY;
int barWidth;
int barHeight;
};
static void drawBattery(const GfxRenderer& renderer, int left, int top, bool showPercentage = true);