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

Review comments

Browse Source
This commit is contained in:
jpirnay
2026-05-19 11:22:05 +02:00
parent d922b5a67a
commit be039ff09b
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/activities/reader/EpubReaderActivity.cpp
+11 -3
View File
@@ -613,6 +613,8 @@ void EpubReaderActivity::onReaderMenuConfirm(EpubReaderMenuActivity::MenuAction
: std::nullopt; : std::nullopt;
if (resolvedPage) { if (resolvedPage) {
section->currentPage = *resolvedPage; section->currentPage = *resolvedPage;
forceLoadLargeImages = false;
pageHasPlaceholders = false;
} else { } else {
navTarget = navTarget =
chapter.tocIndex ? NavigationTarget::makeTocIndex(*chapter.tocIndex) : NavigationTarget::makePage(0); chapter.tocIndex ? NavigationTarget::makeTocIndex(*chapter.tocIndex) : NavigationTarget::makePage(0);
@@ -1716,6 +1718,8 @@ void EpubReaderActivity::render(RenderLock&& lock) {
navTarget.resolveInto(*section, currentSpineIndex); navTarget.resolveInto(*section, currentSpineIndex);
navTarget = NavigationTarget::makePage(section->currentPage); navTarget = NavigationTarget::makePage(section->currentPage);
forceLoadLargeImages = false;
pageHasPlaceholders = false;
} }
renderer.clearScreen(); renderer.clearScreen();
@@ -1876,6 +1880,9 @@ void EpubReaderActivity::renderContents(std::unique_ptr<Page> page, const int or
} }
lastRenderStats.textAntiAliasing = aaEnabledForThisRender; lastRenderStats.textAntiAliasing = aaEnabledForThisRender;
const bool effectiveForceLoad = forceLoadLargeImages || !SETTINGS.largeImagePlaceholder;
pageHasPlaceholders = page->hasPlaceholderImages(effectiveForceLoad);
// Force special handling for pages with real (non-placeholder) images when anti-aliasing is on // Force special handling for pages with real (non-placeholder) images when anti-aliasing is on
bool imagePageWithAA = page->hasImages() && !pageHasPlaceholders && aaEnabledForThisRender; bool imagePageWithAA = page->hasImages() && !pageHasPlaceholders && aaEnabledForThisRender;
bool forceHalfRefreshThisPage = pendingHalfRefreshAfterImagePage && SETTINGS.halfRefreshAfterImagePage; bool forceHalfRefreshThisPage = pendingHalfRefreshAfterImagePage && SETTINGS.halfRefreshAfterImagePage;
@@ -1883,9 +1890,6 @@ void EpubReaderActivity::renderContents(std::unique_ptr<Page> page, const int or
lastRenderStats.imagePageWithAA = imagePageWithAA; lastRenderStats.imagePageWithAA = imagePageWithAA;
lastRenderStats.forcedHalfRefresh = forceHalfRefreshThisPage; lastRenderStats.forcedHalfRefresh = forceHalfRefreshThisPage;
const bool effectiveForceLoad = forceLoadLargeImages || !SETTINGS.largeImagePlaceholder;
pageHasPlaceholders = page->hasPlaceholderImages(effectiveForceLoad);
logReaderMemSnapshot("before_bw_render"); logReaderMemSnapshot("before_bw_render");
page->render(renderer, getEffectiveReaderFontId(), orientedMarginLeft, contentTop, effectiveForceLoad); page->render(renderer, getEffectiveReaderFontId(), orientedMarginLeft, contentTop, effectiveForceLoad);
renderStatusBar(); renderStatusBar();
@@ -2369,6 +2373,8 @@ void EpubReaderActivity::onButtonAction(const CrossPointSettings::BUTTON_ACTION
: std::nullopt; : std::nullopt;
if (resolvedPage) { if (resolvedPage) {
section->currentPage = *resolvedPage; section->currentPage = *resolvedPage;
forceLoadLargeImages = false;
pageHasPlaceholders = false;
} else { } else {
navTarget = chapter.tocIndex ? NavigationTarget::makeTocIndex(*chapter.tocIndex) navTarget = chapter.tocIndex ? NavigationTarget::makeTocIndex(*chapter.tocIndex)
: NavigationTarget::makePage(0); : NavigationTarget::makePage(0);
@@ -2395,6 +2401,8 @@ void EpubReaderActivity::onButtonAction(const CrossPointSettings::BUTTON_ACTION
if (newSpineIndex == currentSpineIndex) { if (newSpineIndex == currentSpineIndex) {
if (const auto resolvedPage = section->getPageForTocIndex(nextTocIndex)) { if (const auto resolvedPage = section->getPageForTocIndex(nextTocIndex)) {
section->currentPage = *resolvedPage; section->currentPage = *resolvedPage;
forceLoadLargeImages = false;
pageHasPlaceholders = false;
} }
} else { } else {
navTarget = NavigationTarget::makeTocIndex(nextTocIndex); navTarget = NavigationTarget::makeTocIndex(nextTocIndex);