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

And halfway back

Browse Source
This commit is contained in:
jpirnay
2026-04-27 14:12:11 +02:00
parent d4c0073b00
commit 2bce78c07a
2 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/activities/reader/EpubReaderActivity.cpp
+28
View File
@@ -248,6 +248,10 @@ void EpubReaderActivity::loop() {
} }
} }
bool delayedPrevTurn = false;
bool delayedNextTurn = false;
using BA = CrossPointSettings::BUTTON_ACTION;
ButtonEventManager::ButtonEvent ev; ButtonEventManager::ButtonEvent ev;
while (buttonEvents.consumeEvent(ev)) { while (buttonEvents.consumeEvent(ev)) {
if (ev.button == MappedInputManager::Button::Confirm) { if (ev.button == MappedInputManager::Button::Confirm) {
@@ -306,9 +310,33 @@ void EpubReaderActivity::loop() {
return; return;
} }
} }
if (ev.type == ButtonEventManager::PressType::Short) {
if ((ev.button == MappedInputManager::Button::PageBack && SETTINGS.btnShortPageBack == BA::BTN_DEFAULT &&
ButtonEventManager::hasDoubleAction(MappedInputManager::Button::PageBack)) ||
(ev.button == MappedInputManager::Button::Left && SETTINGS.btnShortLeft == BA::BTN_DEFAULT &&
ButtonEventManager::hasDoubleAction(MappedInputManager::Button::Left))) {
delayedPrevTurn = true;
continue;
}
if ((ev.button == MappedInputManager::Button::PageForward && SETTINGS.btnShortPageForward == BA::BTN_DEFAULT &&
ButtonEventManager::hasDoubleAction(MappedInputManager::Button::PageForward)) ||
(ev.button == MappedInputManager::Button::Right && SETTINGS.btnShortRight == BA::BTN_DEFAULT &&
ButtonEventManager::hasDoubleAction(MappedInputManager::Button::Right))) {
delayedNextTurn = true;
continue;
}
}
} }
auto [prevTriggered, nextTriggered] = ReaderUtils::detectPageTurn(mappedInput); auto [prevTriggered, nextTriggered] = ReaderUtils::detectPageTurn(mappedInput);
if (!prevTriggered && !nextTriggered) {
if (!delayedPrevTurn && !delayedNextTurn) {
return;
}
prevTriggered = delayedPrevTurn;
nextTriggered = delayedNextTurn;
}
if (!prevTriggered && !nextTriggered) { if (!prevTriggered && !nextTriggered) {
return; return;
} }
src/activities/reader/XtcReaderActivity.cpp
+28
View File
@@ -64,6 +64,10 @@ void XtcReaderActivity::loop() {
return; return;
} }
bool delayedPrevTurn = false;
bool delayedNextTurn = false;
using BA = CrossPointSettings::BUTTON_ACTION;
ButtonEventManager::ButtonEvent ev; ButtonEventManager::ButtonEvent ev;
while (buttonEvents.consumeEvent(ev)) { while (buttonEvents.consumeEvent(ev)) {
if (ev.button == MappedInputManager::Button::Confirm && ev.type == ButtonEventManager::PressType::Short) { if (ev.button == MappedInputManager::Button::Confirm && ev.type == ButtonEventManager::PressType::Short) {
@@ -92,9 +96,33 @@ void XtcReaderActivity::loop() {
return; return;
} }
} }
if (ev.type == ButtonEventManager::PressType::Short) {
if ((ev.button == MappedInputManager::Button::PageBack && SETTINGS.btnShortPageBack == BA::BTN_DEFAULT &&
ButtonEventManager::hasDoubleAction(MappedInputManager::Button::PageBack)) ||
(ev.button == MappedInputManager::Button::Left && SETTINGS.btnShortLeft == BA::BTN_DEFAULT &&
ButtonEventManager::hasDoubleAction(MappedInputManager::Button::Left))) {
delayedPrevTurn = true;
continue;
}
if ((ev.button == MappedInputManager::Button::PageForward && SETTINGS.btnShortPageForward == BA::BTN_DEFAULT &&
ButtonEventManager::hasDoubleAction(MappedInputManager::Button::PageForward)) ||
(ev.button == MappedInputManager::Button::Right && SETTINGS.btnShortRight == BA::BTN_DEFAULT &&
ButtonEventManager::hasDoubleAction(MappedInputManager::Button::Right))) {
delayedNextTurn = true;
continue;
}
}
} }
auto [prevTriggered, nextTriggered] = ReaderUtils::detectPageTurn(mappedInput); auto [prevTriggered, nextTriggered] = ReaderUtils::detectPageTurn(mappedInput);
if (!prevTriggered && !nextTriggered) {
if (!delayedPrevTurn && !delayedNextTurn) {
return;
}
prevTriggered = delayedPrevTurn;
nextTriggered = delayedNextTurn;
}
if (!prevTriggered && !nextTriggered) { if (!prevTriggered && !nextTriggered) {
return; return;