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

Merge 616619d0d3 into da4d3b5ea5

Browse Source
This commit is contained in:
Baris Albayrak 2026-01-27 23:00:14 +05:00 committed by GitHub
commit 0ef167ce7a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ namespace {
// pagesPerRefresh now comes from SETTINGS.getRefreshFrequency()
constexpr unsigned long skipChapterMs = 700;
constexpr unsigned long goHomeMs = 1000;
constexpr unsigned long rotateScreenMs = 1000;
constexpr int statusBarMargin = 19;
constexpr int progressBarMarginTop = 1;
@ -123,8 +124,14 @@ void EpubReaderActivity::loop() {
return;
}
// Long press CONFIRM (1s+) rotates the screen
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm) && mappedInput.getHeldTime() >= rotateScreenMs) {
rotateScreen();
return;
}
// Enter chapter selection activity
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm) && mappedInput.getHeldTime() < rotateScreenMs) {
// Don't start activity transition while rendering
xSemaphoreTake(renderingMutex, portMAX_DELAY);
const int currentPage = section ? section->currentPage : 0;
@ -553,3 +560,48 @@ void EpubReaderActivity::renderStatusBar(const int orientedMarginRight, const in
title.c_str());
}
}
void EpubReaderActivity::rotateScreen() {
// We don't want to change orientation mid-render, so grab the semaphore
xSemaphoreTake(renderingMutex, portMAX_DELAY);
// If a section is loaded, preserve the current page number
if (section) {
nextPageNumber = section->currentPage;
}
//
// Cycle to next orientation
//
uint8_t newOrientation = (SETTINGS.orientation + 1) % 4;
SETTINGS.orientation = newOrientation;
SETTINGS.saveToFile();
//
// Apply orientation to renderer
//
switch (SETTINGS.orientation) {
case CrossPointSettings::ORIENTATION::PORTRAIT:
renderer.setOrientation(GfxRenderer::Orientation::Portrait);
break;
case CrossPointSettings::ORIENTATION::LANDSCAPE_CW:
renderer.setOrientation(GfxRenderer::Orientation::LandscapeClockwise);
break;
case CrossPointSettings::ORIENTATION::INVERTED:
renderer.setOrientation(GfxRenderer::Orientation::PortraitInverted);
break;
case CrossPointSettings::ORIENTATION::LANDSCAPE_CCW:
renderer.setOrientation(GfxRenderer::Orientation::LandscapeCounterClockwise);
break;
default:
break;
}
//
// Force a redraw
//
section.reset();
updateRequired = true;
xSemaphoreGive(renderingMutex);
}

1
src/activities/reader/EpubReaderActivity.h
View File

@ -27,6 +27,7 @@ class EpubReaderActivity final : public ActivityWithSubactivity {
void renderContents(std::unique_ptr<Page> page, int orientedMarginTop, int orientedMarginRight,
int orientedMarginBottom, int orientedMarginLeft);
void renderStatusBar(int orientedMarginRight, int orientedMarginBottom, int orientedMarginLeft) const;
void rotateScreen();
public:
explicit EpubReaderActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, std::unique_ptr<Epub> epub,