Merge branch 'master' of https://github.com/jpirnay/crosspoint-reader into refactor-pr

This commit is contained in:
jpirnay
2026-05-19 11:23:05 +02:00
2 changed files with 6 additions and 4 deletions
+4 -2
View File
@@ -2136,7 +2136,8 @@ void EpubReaderActivity::renderContents(std::unique_ptr<Page> page, const int or
}
}
void EpubReaderActivity::renderPageContentOnly(Page& page, const int orientedMarginTop, const int orientedMarginRight,
void EpubReaderActivity::renderPageContentOnly(const Page& page, const int orientedMarginTop,
const int orientedMarginRight,
const int orientedMarginBottom, const int orientedMarginLeft) {
auto* fcm = renderer.getFontCacheManager();
fcm->resetStats();
@@ -2153,7 +2154,8 @@ void EpubReaderActivity::renderPageContentOnly(Page& page, const int orientedMar
// Status bar intentionally omitted — superimposed at display time with live values.
}
void EpubReaderActivity::displayPreRenderedPage(Page& page, const int orientedMarginTop, const int orientedMarginRight,
void EpubReaderActivity::displayPreRenderedPage(const Page& page, const int orientedMarginTop,
const int orientedMarginRight,
const int orientedMarginBottom, const int orientedMarginLeft) {
const int viewportHeight = std::max(0, renderer.getScreenHeight() - orientedMarginTop - orientedMarginBottom);
const int contentTop = orientedMarginTop + getImageOnlyPageYOffset(page, viewportHeight);
+2 -2
View File
@@ -249,12 +249,12 @@ class EpubReaderActivity final : public Activity {
// Renders page content into the frame buffer (prewarm + BW pass) without drawing the status bar
// or flushing to the display. Used by the pre-render pass so the status bar can be superimposed
// at display time with live values (clock, battery).
void renderPageContentOnly(Page& page, int orientedMarginTop, int orientedMarginRight, int orientedMarginBottom,
void renderPageContentOnly(const Page& page, int orientedMarginTop, int orientedMarginRight, int orientedMarginBottom,
int orientedMarginLeft);
// Draws the status bar over the current frame buffer and flushes to the display.
// Handles the refresh cycle and grayscale AA pass. page must be the same page
// that was last rendered into the buffer (needed for image AA re-render).
void displayPreRenderedPage(Page& page, int orientedMarginTop, int orientedMarginRight, int orientedMarginBottom,
void displayPreRenderedPage(const Page& page, int orientedMarginTop, int orientedMarginRight, int orientedMarginBottom,
int orientedMarginLeft);
void renderStatusBar() const;
void silentIndexNextChapterIfNeeded(uint16_t viewportWidth, uint16_t viewportHeight);