snark13/Xteink-X4-crosspoint-reader
1
0
Fork 0
mirror of https://github.com/daveallie/crosspoint-reader.git synced 2026-02-05 23:27:38 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't change pages during skipping delay

Browse Source
This commit is contained in:
Yaroslav 2026-01-22 00:11:46 +03:00
parent 344f675233
commit 92337be649
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/activities/reader/EpubReaderActivity.cpp
View File

@ -179,7 +179,7 @@ void EpubReaderActivity::loop() {
delayedSkipDir = nextPressed ? +1 : -1; delayedSkipDir = nextPressed ? +1 : -1;
delayedSkipExecuteAtMs = millis() + 500; delayedSkipExecuteAtMs = millis() + 500;
xSemaphoreGive(renderingMutex); xSemaphoreGive(renderingMutex);
// Block release-based page change until unpressed // Block changing page until unpressed skip button
awaitingReleaseAfterSkip = true; awaitingReleaseAfterSkip = true;
return; return;
} }
@ -191,6 +191,10 @@ void EpubReaderActivity::loop() {
mappedInput.wasReleased(MappedInputManager::Button::Power)) || mappedInput.wasReleased(MappedInputManager::Button::Power)) ||
mappedInput.wasReleased(MappedInputManager::Button::Right); mappedInput.wasReleased(MappedInputManager::Button::Right);
if (delayedSkipPending) {
return;
}
if (!prevReleased && !nextReleased) { if (!prevReleased && !nextReleased) {
return; return;
} }
@ -252,7 +256,6 @@ void EpubReaderActivity::displayTaskLoop() {
renderScreen(); renderScreen();
xSemaphoreGive(renderingMutex); xSemaphoreGive(renderingMutex);
} else if (delayedSkipPending && now >= delayedSkipExecuteAtMs) { } else if (delayedSkipPending && now >= delayedSkipExecuteAtMs) {
// Execute the delayed chapter skip now
xSemaphoreTake(renderingMutex, portMAX_DELAY); xSemaphoreTake(renderingMutex, portMAX_DELAY);
nextPageNumber = 0; nextPageNumber = 0;
currentSpineIndex += delayedSkipDir; currentSpineIndex += delayedSkipDir;

6
src/activities/reader/XtcReaderActivity.cpp
View File

@ -128,7 +128,7 @@ void XtcReaderActivity::loop() {
delayedSkipAmount = 10; // long-press skip amount delayedSkipAmount = 10; // long-press skip amount
delayedSkipExecuteAtMs = millis() + 500; delayedSkipExecuteAtMs = millis() + 500;
xSemaphoreGive(renderingMutex); xSemaphoreGive(renderingMutex);
// Block release-based page change until unpressed // Block changing page until unpressed skip button
awaitingReleaseAfterSkip = true; awaitingReleaseAfterSkip = true;
return; return;
} }
@ -140,6 +140,10 @@ void XtcReaderActivity::loop() {
mappedInput.wasReleased(MappedInputManager::Button::Power)) || mappedInput.wasReleased(MappedInputManager::Button::Power)) ||
mappedInput.wasReleased(MappedInputManager::Button::Right); mappedInput.wasReleased(MappedInputManager::Button::Right);
if (delayedSkipPending) {
return;
}
if (!prevReleased && !nextReleased) { if (!prevReleased && !nextReleased) {
return; return;
} }