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

Add double and long clicks in lists

Browse Source
This commit is contained in:
jpirnay
2026-05-13 14:00:07 +02:00
parent d337110649
commit c8c697da06
24 changed files with 169 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/activities/home/FileBrowserActivity.cpp
+8 -26
View File
@@ -119,7 +119,7 @@ void FileBrowserActivity::onEnter() {
if (!focusName.empty()) {
const size_t idx = findEntry(focusName);
if (idx < files.size()) {
selectorIndex = idx;
selectorIndex = static_cast<int>(idx);
}
focusName.clear();
}
@@ -141,8 +141,6 @@ void FileBrowserActivity::clearFileMetadata(const std::string& fullPath) {
}
void FileBrowserActivity::loop() {
const int pageItems = UITheme::getInstance().getNumberOfItemsPerPage(renderer, true, false, true, false);
ButtonEventManager::ButtonEvent ev;
while (buttonEvents.consumeEvent(ev)) {
if (ev.button == MappedInputManager::Button::Back) {
@@ -162,7 +160,7 @@ void FileBrowserActivity::loop() {
const auto pos = oldPath.find_last_of('/');
const std::string dirName = oldPath.substr(pos + 1) + "/";
const size_t idx = findEntry(dirName);
selectorIndex = (idx < files.size()) ? idx : 0;
selectorIndex = (idx < files.size()) ? static_cast<int>(idx) : 0;
requestUpdate();
} else if (mode == Mode::PickFirmware) {
// At root in PickFirmware: cancel back to caller.
@@ -249,8 +247,8 @@ void FileBrowserActivity::loop() {
loadFiles();
if (files.empty()) {
selectorIndex = 0;
} else if (selectorIndex >= files.size()) {
selectorIndex = files.size() - 1;
} else if (selectorIndex >= static_cast<int>(files.size())) {
selectorIndex = static_cast<int>(files.size()) - 1;
}
requestUpdate(true);
} else {
@@ -280,27 +278,11 @@ void FileBrowserActivity::loop() {
}
}
// Up/Down side buttons navigate the list
// Up/Down side buttons navigate the list (Left/Right are reserved for Back/Info actions)
const int listSize = static_cast<int>(files.size());
buttonNavigator.onRelease({MappedInputManager::Button::Down}, [this, listSize] {
selectorIndex = ButtonNavigator::nextIndex(static_cast<int>(selectorIndex), listSize);
requestUpdate();
});
buttonNavigator.onRelease({MappedInputManager::Button::Up}, [this, listSize] {
selectorIndex = ButtonNavigator::previousIndex(static_cast<int>(selectorIndex), listSize);
requestUpdate();
});
buttonNavigator.onContinuous({MappedInputManager::Button::Down}, [this, listSize, pageItems] {
selectorIndex = ButtonNavigator::nextPageIndex(static_cast<int>(selectorIndex), listSize, pageItems);
requestUpdate();
});
buttonNavigator.onContinuous({MappedInputManager::Button::Up}, [this, listSize, pageItems] {
selectorIndex = ButtonNavigator::previousPageIndex(static_cast<int>(selectorIndex), listSize, pageItems);
requestUpdate();
});
buttonNavigator.onNextList({MappedInputManager::Button::Down}, selectorIndex, listSize, [this] { requestUpdate(); });
buttonNavigator.onPreviousList({MappedInputManager::Button::Up}, selectorIndex, listSize,
[this] { requestUpdate(); });
}
std::string getFileName(std::string filename) {
src/activities/home/FileBrowserActivity.h
+1 -1
View File
@@ -19,7 +19,7 @@ class FileBrowserActivity final : public Activity {
ButtonNavigator buttonNavigator;
size_t selectorIndex = 0;
int selectorIndex = 0;
Mode mode = Mode::Books;
src/activities/home/GlobalBookmarksActivity.cpp
+3 -32
View File
@@ -250,39 +250,10 @@ void GlobalBookmarksActivity::loop() {
return;
}
const int pageItems = UITheme::getInstance().getNumberOfItemsPerPage(renderer, true, false, true, false);
// Navigator is restricted to Up/Down so the Left (rename) and Right (delete)
// handlers above cannot race default cursor movement on the same release tick.
buttonNavigator.onRelease({MappedInputManager::Button::Down}, [this] {
selectorIndex = buttonNavigator.nextIndex(selectorIndex);
requestUpdate();
});
buttonNavigator.onRelease({MappedInputManager::Button::Up}, [this] {
selectorIndex = buttonNavigator.previousIndex(selectorIndex);
requestUpdate();
});
buttonNavigator.onContinuous({MappedInputManager::Button::Down}, [this, total, pageItems] {
int next = ButtonNavigator::nextPageIndex(selectorIndex, total, pageItems);
if (isSeparatorRow(next)) {
const int adj = ButtonNavigator::nextIndex(next, total, [this](int i) { return !isSeparatorRow(i); });
if (adj >= 0) next = adj;
}
selectorIndex = next;
requestUpdate();
});
buttonNavigator.onContinuous({MappedInputManager::Button::Up}, [this, total, pageItems] {
int prev = ButtonNavigator::previousPageIndex(selectorIndex, total, pageItems);
if (isSeparatorRow(prev)) {
const int adj = ButtonNavigator::previousIndex(prev, total, [this](int i) { return !isSeparatorRow(i); });
if (adj >= 0) prev = adj;
}
selectorIndex = prev;
requestUpdate();
});
// handlers above cannot race default cursor movement on the same press tick.
buttonNavigator.onNextList({MappedInputManager::Button::Down}, selectorIndex, total, [this] { requestUpdate(); });
buttonNavigator.onPreviousList({MappedInputManager::Button::Up}, selectorIndex, total, [this] { requestUpdate(); });
}
void GlobalBookmarksActivity::render(RenderLock&&) {
src/activities/home/RecentBooksActivity.cpp
+13 -34
View File
@@ -38,8 +38,8 @@ void RecentBooksActivity::onEnter() {
loadRecentBooks();
selectorIndex = 0;
if (initialFocusIndex >= 0 && static_cast<size_t>(initialFocusIndex) < recentBooks.size()) {
selectorIndex = static_cast<size_t>(initialFocusIndex);
if (initialFocusIndex >= 0 && initialFocusIndex < static_cast<int>(recentBooks.size())) {
selectorIndex = initialFocusIndex;
}
initialFocusIndex = -1;
requestUpdate();
@@ -51,13 +51,11 @@ void RecentBooksActivity::onExit() {
}
void RecentBooksActivity::loop() {
const int pageItems = UITheme::getInstance().getNumberOfItemsPerPage(renderer, true, false, true, true);
ButtonEventManager::ButtonEvent ev;
while (buttonEvents.consumeEvent(ev)) {
if (ev.button == MappedInputManager::Button::Confirm &&
(ev.type == ButtonEventManager::PressType::Short || ev.type == ButtonEventManager::PressType::Long)) {
if (recentBooks.empty() || selectorIndex >= recentBooks.size()) {
if (recentBooks.empty() || selectorIndex >= static_cast<int>(recentBooks.size())) {
return;
}
// Long-press Confirm signals "open with KOReader sync" only for EPUBs.
@@ -75,7 +73,7 @@ void RecentBooksActivity::loop() {
}
ReturnHint hint;
hint.target = ReturnTo::RecentBooks;
hint.selectIndex = static_cast<int>(selectorIndex);
hint.selectIndex = selectorIndex;
activityManager.replaceWithReader(recentBooks[selectorIndex].path, std::move(hint));
return;
}
@@ -86,7 +84,7 @@ void RecentBooksActivity::loop() {
}
if (ev.button == MappedInputManager::Button::Left && ev.type == ButtonEventManager::PressType::Short) {
if (recentBooks.empty() || selectorIndex >= recentBooks.size()) return;
if (recentBooks.empty() || selectorIndex >= static_cast<int>(recentBooks.size())) return;
const std::string bookPath = recentBooks[selectorIndex].path;
const std::string bookTitle = recentBooks[selectorIndex].title;
@@ -97,8 +95,8 @@ void RecentBooksActivity::loop() {
loadRecentBooks();
if (recentBooks.empty()) {
selectorIndex = 0;
} else if (selectorIndex >= recentBooks.size()) {
selectorIndex = recentBooks.size() - 1;
} else if (selectorIndex >= static_cast<int>(recentBooks.size())) {
selectorIndex = static_cast<int>(recentBooks.size()) - 1;
}
requestUpdate(true);
} else {
@@ -113,7 +111,7 @@ void RecentBooksActivity::loop() {
}
if (ev.button == MappedInputManager::Button::Right && ev.type == ButtonEventManager::PressType::Short) {
if (recentBooks.empty() || selectorIndex >= recentBooks.size()) return;
if (recentBooks.empty() || selectorIndex >= static_cast<int>(recentBooks.size())) return;
const std::string& path = recentBooks[selectorIndex].path;
if (FsHelpers::hasEpubExtension(path) || FsHelpers::hasXtcExtension(path)) {
startActivityForResult(std::make_unique<BookInfoActivity>(renderer, mappedInput, path),
@@ -123,31 +121,12 @@ void RecentBooksActivity::loop() {
}
}
int listSize = static_cast<int>(recentBooks.size());
// Navigator is restricted to Up/Down so it cannot race the Left/Right Short
// handlers above: with a double-click action configured, Short events are
// deferred 300ms while wasReleased() is immediate, which would otherwise let
// the cursor move before the custom action runs on the wrong entry.
buttonNavigator.onRelease({MappedInputManager::Button::Down}, [this, listSize] {
selectorIndex = ButtonNavigator::nextIndex(static_cast<int>(selectorIndex), listSize);
requestUpdate();
});
buttonNavigator.onRelease({MappedInputManager::Button::Up}, [this, listSize] {
selectorIndex = ButtonNavigator::previousIndex(static_cast<int>(selectorIndex), listSize);
requestUpdate();
});
buttonNavigator.onContinuous({MappedInputManager::Button::Down}, [this, listSize, pageItems] {
selectorIndex = ButtonNavigator::nextPageIndex(static_cast<int>(selectorIndex), listSize, pageItems);
requestUpdate();
});
buttonNavigator.onContinuous({MappedInputManager::Button::Up}, [this, listSize, pageItems] {
selectorIndex = ButtonNavigator::previousPageIndex(static_cast<int>(selectorIndex), listSize, pageItems);
requestUpdate();
});
// handlers above (Left/Right actions are not in the onNextList/onPreviousList button sets).
const int listSize = static_cast<int>(recentBooks.size());
buttonNavigator.onNextList({MappedInputManager::Button::Down}, selectorIndex, listSize, [this] { requestUpdate(); });
buttonNavigator.onPreviousList({MappedInputManager::Button::Up}, selectorIndex, listSize,
[this] { requestUpdate(); });
}
void RecentBooksActivity::render(RenderLock&&) {
src/activities/home/RecentBooksActivity.h
+1 -1
View File
@@ -13,7 +13,7 @@ class RecentBooksActivity final : public Activity {
private:
ButtonNavigator buttonNavigator;
size_t selectorIndex = 0;
int selectorIndex = 0;
int initialFocusIndex = -1; // applied once in onEnter(), then cleared
// Recent tab state