eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Recognize and use printed pages info

Browse Source
This commit is contained in:
jpirnay
2026-05-23 17:53:45 +02:00
parent 6717c02173
commit 3671bdba0b
20 changed files with 869 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/themes/BaseTheme.cpp
+16 -7
View File
@@ -764,8 +764,8 @@ void BaseTheme::fillPopupProgress(const GfxRenderer& renderer, const Rect& layou
}
void BaseTheme::drawStatusBar(GfxRenderer& renderer, const float bookProgress, const int currentPage,
const int pageCount, std::string title, const int paddingBottom,
const bool isStarred) const {
const int pageCount, std::string title, const int paddingBottom, const bool isStarred,
const std::string& printedPageLabel) const {
auto metrics = UITheme::getInstance().getMetrics();
int orientedMarginTop, orientedMarginRight, orientedMarginBottom, orientedMarginLeft;
renderer.getOrientedViewableTRBL(&orientedMarginTop, &orientedMarginRight, &orientedMarginBottom,
@@ -814,7 +814,9 @@ void BaseTheme::drawStatusBar(GfxRenderer& renderer, const float bookProgress, c
int progressTextWidth = 0;
if (hasProgressText) {
// Right aligned text for progress counter
// Right-aligned device page counter / progress percentage. The printed-page label, if any,
// is drawn to the LEFT of this counter as a parenthesised hint — the device counter on the
// right always reflects spine pagination.
char progressStr[32];
if (SETTINGS.statusBarBookProgressPercentage && SETTINGS.statusBarChapterPageCount) {
@@ -825,10 +827,17 @@ void BaseTheme::drawStatusBar(GfxRenderer& renderer, const float bookProgress, c
snprintf(progressStr, sizeof(progressStr), "%d/%d", currentPage, pageCount);
}
progressTextWidth = renderer.getTextWidth(SMALL_FONT_ID, progressStr);
renderer.drawText(SMALL_FONT_ID,
screenWidth - metrics.statusBarHorizontalMargin - orientedMarginRight - progressTextWidth, textY,
progressStr);
const int progressStrWidth = renderer.getTextWidth(SMALL_FONT_ID, progressStr);
const int printedLabelWidth =
printedPageLabel.empty() ? 0 : renderer.getTextWidth(SMALL_FONT_ID, printedPageLabel.c_str());
const int printedLabelGap = printedLabelWidth > 0 ? 8 : 0;
progressTextWidth = progressStrWidth + printedLabelGap + printedLabelWidth;
const int textX = screenWidth - metrics.statusBarHorizontalMargin - orientedMarginRight - progressStrWidth;
renderer.drawText(SMALL_FONT_ID, textX, textY, progressStr);
if (!printedPageLabel.empty()) {
renderer.drawText(SMALL_FONT_ID, textX - printedLabelGap - printedLabelWidth, textY, printedPageLabel.c_str());
}
}
// Draw Battery