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-04-09 23:16:32 +02:00
parent 6e7e86b9b6
commit 9fbd3cc1f7
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/activities/reader/EpubReaderMenuActivity.cpp
+4 -4
View File
@@ -68,10 +68,10 @@ std::function<bool(int)> EpubReaderMenuActivity::buildSelectablePredicate() cons
void EpubReaderMenuActivity::onEnter() { void EpubReaderMenuActivity::onEnter() {
Activity::onEnter(); Activity::onEnter();
buttonNavigator.setSelectablePredicate(buildSelectablePredicate(), static_cast<int>(menuItems.size())); const auto selectablePredicate = buildSelectablePredicate();
const int next = buttonNavigator.nextIndex(selectedIndex); buttonNavigator.setSelectablePredicate(selectablePredicate, static_cast<int>(menuItems.size()));
if (next != selectedIndex) { if (!selectablePredicate(selectedIndex)) {
selectedIndex = next; selectedIndex = buttonNavigator.nextIndex(selectedIndex);
} }
requestUpdate(); requestUpdate();
} }
src/components/themes/BaseTheme.cpp
-4
View File
@@ -291,9 +291,6 @@ void BaseTheme::drawList(const GfxRenderer& renderer, Rect rect, int itemCount,
const bool isSeparator = UITheme::isSeparatorTitle(itemName); const bool isSeparator = UITheme::isSeparatorTitle(itemName);
if (isSeparator) { if (isSeparator) {
itemName = UITheme::stripSeparatorTitle(itemName); itemName = UITheme::stripSeparatorTitle(itemName);
}
if (isSeparator) {
drawListSeparator(renderer, drawListSeparator(renderer,
Rect{rect.x + BaseMetrics::values.contentSidePadding, itemY, Rect{rect.x + BaseMetrics::values.contentSidePadding, itemY,
contentWidth - BaseMetrics::values.contentSidePadding * 2, rowHeight}, contentWidth - BaseMetrics::values.contentSidePadding * 2, rowHeight},
@@ -304,7 +301,6 @@ void BaseTheme::drawList(const GfxRenderer& renderer, Rect rect, int itemCount,
auto font = (rowSubtitle != nullptr) ? UI_12_FONT_ID : UI_10_FONT_ID; auto font = (rowSubtitle != nullptr) ? UI_12_FONT_ID : UI_10_FONT_ID;
auto item = renderer.truncatedText(font, itemName.c_str(), textWidth); auto item = renderer.truncatedText(font, itemName.c_str(), textWidth);
renderer.drawText(font, rect.x + BaseMetrics::values.contentSidePadding, itemY, item.c_str(), true); renderer.drawText(font, rect.x + BaseMetrics::values.contentSidePadding, itemY, item.c_str(), true);
renderer.drawText(font, rect.x + BaseMetrics::values.contentSidePadding, itemY, item.c_str(), true);
if (rowSubtitle != nullptr) { if (rowSubtitle != nullptr) {
// Draw subtitle; if the text is newline-separated (author\nseries), join with • for single-line display // Draw subtitle; if the text is newline-separated (author\nseries), join with • for single-line display
src/components/themes/lyra/LyraTheme.cpp
-3
View File
@@ -446,9 +446,6 @@ void LyraTheme::drawList(const GfxRenderer& renderer, Rect rect, int itemCount,
const bool isSeparator = UITheme::isSeparatorTitle(itemName); const bool isSeparator = UITheme::isSeparatorTitle(itemName);
if (isSeparator) { if (isSeparator) {
itemName = UITheme::stripSeparatorTitle(itemName); itemName = UITheme::stripSeparatorTitle(itemName);
}
if (isSeparator) {
drawListSeparator(renderer, drawListSeparator(renderer,
Rect{rect.x + LyraMetrics::values.contentSidePadding, itemY, Rect{rect.x + LyraMetrics::values.contentSidePadding, itemY,
contentWidth - LyraMetrics::values.contentSidePadding * 2, rowHeight}, contentWidth - LyraMetrics::values.contentSidePadding * 2, rowHeight},