From a20f861e3c3f46bf206d2e536f40319fabf2f7c2 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Tue, 16 Dec 2025 18:04:04 +0100 Subject: [PATCH] format fixes --- lib/Epub/Epub.cpp | 10 +++++----- src/screens/EpubReaderScreen.cpp | 13 ++++++++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/lib/Epub/Epub.cpp b/lib/Epub/Epub.cpp index 272db70..fcd1615 100644 --- a/lib/Epub/Epub.cpp +++ b/lib/Epub/Epub.cpp @@ -154,11 +154,11 @@ bool Epub::load() { size_t spineItemsCount = getSpineItemsCount(); size_t spineItemsSize = 0; for (size_t i = 0; i < spineItemsCount; i++) { - std::string spineItem = getSpineItem(i); - size_t s = 0; - getItemSize(spineItem, &s); - spineItemsSize += s; - cumulativeSpineItemSize.emplace_back(spineItemsSize); + std::string spineItem = getSpineItem(i); + size_t s = 0; + getItemSize(spineItem, &s); + spineItemsSize += s; + cumulativeSpineItemSize.emplace_back(spineItemsSize); } Serial.printf("[%lu] [EBP] Book size: %u\n", millis(), spineItemsSize); diff --git a/src/screens/EpubReaderScreen.cpp b/src/screens/EpubReaderScreen.cpp index e7434ef..39fd74f 100644 --- a/src/screens/EpubReaderScreen.cpp +++ b/src/screens/EpubReaderScreen.cpp @@ -324,16 +324,19 @@ void EpubReaderScreen::renderStatusBar() const { size_t prevChapterSize = epub->getCumulativeSpineItemSize(currentSpineIndex - 1); size_t curChapterSize = epub->getCumulativeSpineItemSize(currentSpineIndex) - prevChapterSize; size_t bookSize = epub->getCumulativeSpineItemSize(epub->getSpineItemsCount() - 1); - size_t sectionProgSize = static_cast(static_cast(section->currentPage) / section->pageCount * curChapterSize); + size_t sectionProgSize = + static_cast(static_cast(section->currentPage) / section->pageCount * curChapterSize); float bookProgress = static_cast(prevChapterSize + sectionProgSize) / bookSize * 100.0; char bookProgressStr[6] = "--.-"; - std:snprintf(bookProgressStr, 6, "%.1f", bookProgress); - // Serial.printf("[%lu] [EBP] prevChapterSize: %u bookSize: %u sectionProgSize: %u bookSize:%u Book progress: %s %%\n", millis(), +std: + 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); // Right aligned text for progress counter - const std::string progress = std::to_string(section->currentPage + 1) + "/" + std::to_string(section->pageCount) - + " " + bookProgressStr + "%"; + const std::string progress = std::to_string(section->currentPage + 1) + "/" + std::to_string(section->pageCount) + + " " + bookProgressStr + "%"; const auto progressTextWidth = renderer.getTextWidth(SMALL_FONT_ID, progress.c_str()); renderer.drawText(SMALL_FONT_ID, GfxRenderer::getScreenWidth() - marginRight - progressTextWidth, textY, progress.c_str());