snark13/Xteink-X4-crosspoint-reader
1
0
Fork 0
mirror of https://github.com/daveallie/crosspoint-reader.git synced 2025-12-18 15:17:42 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

format fixes

Browse Source
This commit is contained in:
Jonas Diemer 2025-12-16 18:04:04 +01:00
parent 796a7fa785
commit a20f861e3c
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Epub/Epub.cpp
View File

@ -154,11 +154,11 @@ bool Epub::load() {
size_t spineItemsCount = getSpineItemsCount(); size_t spineItemsCount = getSpineItemsCount();
size_t spineItemsSize = 0; size_t spineItemsSize = 0;
for (size_t i = 0; i < spineItemsCount; i++) { for (size_t i = 0; i < spineItemsCount; i++) {
std::string spineItem = getSpineItem(i); std::string spineItem = getSpineItem(i);
size_t s = 0; size_t s = 0;
getItemSize(spineItem, &s); getItemSize(spineItem, &s);
spineItemsSize += s; spineItemsSize += s;
cumulativeSpineItemSize.emplace_back(spineItemsSize); cumulativeSpineItemSize.emplace_back(spineItemsSize);
} }
Serial.printf("[%lu] [EBP] Book size: %u\n", millis(), spineItemsSize); Serial.printf("[%lu] [EBP] Book size: %u\n", millis(), spineItemsSize);

13
src/screens/EpubReaderScreen.cpp
View File

@ -324,16 +324,19 @@ void EpubReaderScreen::renderStatusBar() const {
size_t prevChapterSize = epub->getCumulativeSpineItemSize(currentSpineIndex - 1); size_t prevChapterSize = epub->getCumulativeSpineItemSize(currentSpineIndex - 1);
size_t curChapterSize = epub->getCumulativeSpineItemSize(currentSpineIndex) - prevChapterSize; size_t curChapterSize = epub->getCumulativeSpineItemSize(currentSpineIndex) - prevChapterSize;
size_t bookSize = epub->getCumulativeSpineItemSize(epub->getSpineItemsCount() - 1); size_t bookSize = epub->getCumulativeSpineItemSize(epub->getSpineItemsCount() - 1);
size_t sectionProgSize = static_cast<size_t>(static_cast<float>(section->currentPage) / section->pageCount * curChapterSize); size_t sectionProgSize =
static_cast<size_t>(static_cast<float>(section->currentPage) / section->pageCount * curChapterSize);
float bookProgress = static_cast<float>(prevChapterSize + sectionProgSize) / bookSize * 100.0; float bookProgress = static_cast<float>(prevChapterSize + sectionProgSize) / bookSize * 100.0;
char bookProgressStr[6] = "--.-"; char bookProgressStr[6] = "--.-";
std:snprintf(bookProgressStr, 6, "%.1f", bookProgress); std:
// Serial.printf("[%lu] [EBP] prevChapterSize: %u bookSize: %u sectionProgSize: %u bookSize:%u Book progress: %s %%\n", millis(), snprintf(bookProgressStr, 6, "%.1f", bookProgress);
// Serial.printf("[%lu] [EBP] prevChapterSize: %u bookSize: %u sectionProgSize: %u bookSize:%u Book progress: %s
// %%\n", millis(),
// prevChapterSize, bookSize, sectionProgSize, bookSize, bookProgressStr); // prevChapterSize, bookSize, sectionProgSize, bookSize, bookProgressStr);
// Right aligned text for progress counter // Right aligned text for progress counter
const std::string progress = std::to_string(section->currentPage + 1) + "/" + std::to_string(section->pageCount) const std::string progress = std::to_string(section->currentPage + 1) + "/" + std::to_string(section->pageCount) +
+ " " + bookProgressStr + "%"; " " + bookProgressStr + "%";
const auto progressTextWidth = renderer.getTextWidth(SMALL_FONT_ID, progress.c_str()); const auto progressTextWidth = renderer.getTextWidth(SMALL_FONT_ID, progress.c_str());
renderer.drawText(SMALL_FONT_ID, GfxRenderer::getScreenWidth() - marginRight - progressTextWidth, textY, renderer.drawText(SMALL_FONT_ID, GfxRenderer::getScreenWidth() - marginRight - progressTextWidth, textY,
progress.c_str()); progress.c_str());