From 70f53871f77a9fb972737b46b7799c6610963bd9 Mon Sep 17 00:00:00 2001 From: jpirnay Date: Fri, 20 Mar 2026 18:44:30 +0100 Subject: [PATCH] Fix 2 --- src/activities/reader/EpubReaderActivity.cpp | 6 +++++- src/activities/reader/EpubReaderMenuActivity.cpp | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/activities/reader/EpubReaderActivity.cpp b/src/activities/reader/EpubReaderActivity.cpp index df26df22..7a839191 100644 --- a/src/activities/reader/EpubReaderActivity.cpp +++ b/src/activities/reader/EpubReaderActivity.cpp @@ -86,7 +86,11 @@ void EpubReaderActivity::onEnter() { // Save current epub as last opened epub and add to recent books APP_STATE.openEpubPath = epub->getPath(); APP_STATE.saveToFile(); - RECENT_BOOKS.addBook(epub->getPath(), epub->getTitle(), epub->getAuthor(), epub->getThumbBmpPath()); + std::string series = epub->getSeries(); + if (!series.empty() && !epub->getSeriesIndex().empty()) { + series += " #" + epub->getSeriesIndex(); + } + RECENT_BOOKS.addBook(epub->getPath(), epub->getTitle(), epub->getAuthor(), series, epub->getThumbBmpPath()); const RecentBook currentBook = RECENT_BOOKS.getBookByPath(epub->getPath()); bookEmbeddedStyleOverride = currentBook.embeddedStyleOverride; bookImageRenderingOverride = currentBook.imageRenderingOverride; diff --git a/src/activities/reader/EpubReaderMenuActivity.cpp b/src/activities/reader/EpubReaderMenuActivity.cpp index 124acf72..dc38ef7c 100644 --- a/src/activities/reader/EpubReaderMenuActivity.cpp +++ b/src/activities/reader/EpubReaderMenuActivity.cpp @@ -176,7 +176,7 @@ void EpubReaderMenuActivity::render(RenderLock&&) { value = tr(STR_STATE_OFF); } const auto width = renderer.getTextWidth(UI_10_FONT_ID, value); - renderer.drawText(UI_10_FONT_ID, contentX + contentWidth - 20 - width, displayY, value, !isSelected); + renderer.drawText(UI_10_FONT_ID, contentRect.x + contentRect.width - 20 - width, displayY, value, !isSelected); } if (menuItems[i].action == MenuAction::IMAGE_RENDERING) { @@ -185,7 +185,7 @@ void EpubReaderMenuActivity::render(RenderLock&&) { value = I18N.get(imageRenderingLabels[pendingImageRenderingOverride]); } const auto width = renderer.getTextWidth(UI_10_FONT_ID, value); - renderer.drawText(UI_10_FONT_ID, contentX + contentWidth - 20 - width, displayY, value, !isSelected); + renderer.drawText(UI_10_FONT_ID, contentRect.x + contentRect.width - 20 - width, displayY, value, !isSelected); } }