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

review induced changes

Browse Source
This commit is contained in:
jpirnay
2026-04-24 14:25:11 +02:00
parent 9a72409826
commit 5068817549
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RecentBooksStore.cpp
+7 -1
View File
@@ -84,7 +84,13 @@ RecentBook RecentBooksStore::getBookByPath(const std::string& path) const {
bool RecentBooksStore::setReaderOverrides(const std::string& path, const int8_t embeddedStyleOverride, bool RecentBooksStore::setReaderOverrides(const std::string& path, const int8_t embeddedStyleOverride,
const int8_t imageRenderingOverride) { const int8_t imageRenderingOverride) {
return setReaderOverrides(path, embeddedStyleOverride, imageRenderingOverride, -1, -1); auto it =
std::find_if(recentBooks.begin(), recentBooks.end(), [&](const RecentBook& book) { return book.path == path; });
if (it == recentBooks.end()) {
return false;
}
return setReaderOverrides(path, embeddedStyleOverride, imageRenderingOverride, it->fontFamilyOverride,
it->fontSizeOverride);
} }
bool RecentBooksStore::setReaderOverrides(const std::string& path, const int8_t embeddedStyleOverride, bool RecentBooksStore::setReaderOverrides(const std::string& path, const int8_t embeddedStyleOverride,
src/activities/reader/EpubReaderMenuActivity.cpp
+9 -9
View File
@@ -270,21 +270,21 @@ std::string EpubReaderMenuActivity::getItemValueString(int index) const {
return std::string(tr(STR_DEFAULT_VALUE)) + " (" + defaultEffective + ")"; return std::string(tr(STR_DEFAULT_VALUE)) + " (" + defaultEffective + ")";
} }
if (item.nameId == StrId::STR_IMAGES && pendingImageRenderingOverride < 0) { if (item.nameId == StrId::STR_IMAGES && pendingImageRenderingOverride < 0) {
const auto index = static_cast<size_t>(SETTINGS.imageRendering + 1); const auto defaultIndex = static_cast<size_t>(SETTINGS.imageRendering + 1);
if (index < item.enumValues.size()) { if (defaultIndex < item.enumValues.size()) {
return std::string(tr(STR_DEFAULT_VALUE)) + " (" + I18N.get(item.enumValues[index]) + ")"; return std::string(tr(STR_DEFAULT_VALUE)) + " (" + I18N.get(item.enumValues[defaultIndex]) + ")";
} }
} }
if (item.nameId == StrId::STR_FONT_FAMILY && pendingFontFamilyOverride < 0) { if (item.nameId == StrId::STR_FONT_FAMILY && pendingFontFamilyOverride < 0) {
const auto index = static_cast<size_t>(SETTINGS.fontFamily + 1); const auto defaultIndex = static_cast<size_t>(SETTINGS.fontFamily + 1);
if (index < item.enumValues.size()) { if (defaultIndex < item.enumValues.size()) {
return std::string(tr(STR_DEFAULT_VALUE)) + " (" + I18N.get(item.enumValues[index]) + ")"; return std::string(tr(STR_DEFAULT_VALUE)) + " (" + I18N.get(item.enumValues[defaultIndex]) + ")";
} }
} }
if (item.nameId == StrId::STR_FONT_SIZE && pendingFontSizeOverride < 0) { if (item.nameId == StrId::STR_FONT_SIZE && pendingFontSizeOverride < 0) {
const auto index = static_cast<size_t>(SETTINGS.fontSize + 1); const auto defaultIndex = static_cast<size_t>(SETTINGS.fontSize + 1);
if (index < item.enumValues.size()) { if (defaultIndex < item.enumValues.size()) {
return std::string(tr(STR_DEFAULT_VALUE)) + " (" + I18N.get(item.enumValues[index]) + ")"; return std::string(tr(STR_DEFAULT_VALUE)) + " (" + I18N.get(item.enumValues[defaultIndex]) + ")";
} }
} }
} }