diff --git a/src/activities/reader/EpubReaderActivity.cpp b/src/activities/reader/EpubReaderActivity.cpp index 8068d8cb..aa10a355 100644 --- a/src/activities/reader/EpubReaderActivity.cpp +++ b/src/activities/reader/EpubReaderActivity.cpp @@ -218,6 +218,7 @@ void EpubReaderActivity::loop() { const int bookProgressPercent = clampPercent(static_cast(bookProgress + 0.5f)); const bool isCurrentPageStarred = section && bookmarkStore.has(static_cast(currentSpineIndex), static_cast(section->currentPage)); + ReaderUtils::enforceExitFullRefresh(renderer); startActivityForResult( std::make_unique( renderer, mappedInput, epub->getTitle(), currentPage, totalPages, bookProgressPercent, SETTINGS.orientation, @@ -263,6 +264,7 @@ void EpubReaderActivity::loop() { if (currentPageFootnotes.size() == 1) { navigateToHref(currentPageFootnotes[0].href, true); } else if (currentPageFootnotes.size() > 1) { + ReaderUtils::enforceExitFullRefresh(renderer); startActivityForResult(std::make_unique(renderer, mappedInput, currentPageFootnotes), [this](const ActivityResult& result) { if (!result.isCancelled) { diff --git a/src/activities/reader/EpubReaderMenuActivity.cpp b/src/activities/reader/EpubReaderMenuActivity.cpp index c0e70218..d6a3610a 100644 --- a/src/activities/reader/EpubReaderMenuActivity.cpp +++ b/src/activities/reader/EpubReaderMenuActivity.cpp @@ -1,7 +1,6 @@ #include "EpubReaderMenuActivity.h" #include -#include #include #include "KOReaderCredentialStore.h" @@ -234,10 +233,5 @@ void EpubReaderMenuActivity::render(RenderLock&&) { const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), tr(STR_DIR_UP), tr(STR_DIR_DOWN)); GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4); - if (gpio.deviceIsX3() && !initialHalfRefreshDone) { - initialHalfRefreshDone = true; - renderer.displayBuffer(HalDisplay::HALF_REFRESH); - } else { - renderer.displayBuffer(); - } + renderer.displayBuffer(); } diff --git a/src/activities/reader/EpubReaderMenuActivity.h b/src/activities/reader/EpubReaderMenuActivity.h index 1741eefa..d5fc72c9 100644 --- a/src/activities/reader/EpubReaderMenuActivity.h +++ b/src/activities/reader/EpubReaderMenuActivity.h @@ -62,7 +62,6 @@ class EpubReaderMenuActivity final : public MenuListActivity { int8_t pendingEmbeddedStyleOverride = -1; int8_t pendingImageRenderingOverride = -1; uint8_t pendingTextDarkness = 1; - bool initialHalfRefreshDone = false; static constexpr const char* pageTurnLabels[] = {"", "1", "3", "6", "12"}; diff --git a/src/activities/reader/TxtReaderActivity.cpp b/src/activities/reader/TxtReaderActivity.cpp index 35b95330..b0a2d69a 100644 --- a/src/activities/reader/TxtReaderActivity.cpp +++ b/src/activities/reader/TxtReaderActivity.cpp @@ -162,6 +162,7 @@ void TxtReaderActivity::loop() { // Open starred pages list via Confirm button if (mappedInput.wasReleased(MappedInputManager::Button::Confirm) && !bookmarkStore.isEmpty()) { + ReaderUtils::enforceExitFullRefresh(renderer); startActivityForResult(std::make_unique(renderer, mappedInput, bookmarkStore), [this](const ActivityResult& result) { if (!result.isCancelled) { diff --git a/src/activities/reader/XtcReaderActivity.cpp b/src/activities/reader/XtcReaderActivity.cpp index 80fa9a5f..7b69a78f 100644 --- a/src/activities/reader/XtcReaderActivity.cpp +++ b/src/activities/reader/XtcReaderActivity.cpp @@ -69,6 +69,7 @@ void XtcReaderActivity::loop() { // Enter chapter selection activity if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) { if (xtc && xtc->hasChapters() && !xtc->getChapters().empty()) { + ReaderUtils::enforceExitFullRefresh(renderer); startActivityForResult( std::make_unique(renderer, mappedInput, xtc, currentPage), [this](const ActivityResult& result) {