Fix 2
This commit is contained in:
@@ -86,7 +86,11 @@ void EpubReaderActivity::onEnter() {
|
|||||||
// Save current epub as last opened epub and add to recent books
|
// Save current epub as last opened epub and add to recent books
|
||||||
APP_STATE.openEpubPath = epub->getPath();
|
APP_STATE.openEpubPath = epub->getPath();
|
||||||
APP_STATE.saveToFile();
|
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());
|
const RecentBook currentBook = RECENT_BOOKS.getBookByPath(epub->getPath());
|
||||||
bookEmbeddedStyleOverride = currentBook.embeddedStyleOverride;
|
bookEmbeddedStyleOverride = currentBook.embeddedStyleOverride;
|
||||||
bookImageRenderingOverride = currentBook.imageRenderingOverride;
|
bookImageRenderingOverride = currentBook.imageRenderingOverride;
|
||||||
|
|||||||
@@ -176,7 +176,7 @@ void EpubReaderMenuActivity::render(RenderLock&&) {
|
|||||||
value = tr(STR_STATE_OFF);
|
value = tr(STR_STATE_OFF);
|
||||||
}
|
}
|
||||||
const auto width = renderer.getTextWidth(UI_10_FONT_ID, value);
|
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) {
|
if (menuItems[i].action == MenuAction::IMAGE_RENDERING) {
|
||||||
@@ -185,7 +185,7 @@ void EpubReaderMenuActivity::render(RenderLock&&) {
|
|||||||
value = I18N.get(imageRenderingLabels[pendingImageRenderingOverride]);
|
value = I18N.get(imageRenderingLabels[pendingImageRenderingOverride]);
|
||||||
}
|
}
|
||||||
const auto width = renderer.getTextWidth(UI_10_FONT_ID, value);
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user