From 06065dfd8b835aff0ecc6bdaeb5b7937684f3352 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Tue, 30 Dec 2025 23:10:41 +0100 Subject: [PATCH] Show book title instead of "Select Chapter". (#169) I think this is nicer ;) --- lib/GfxRenderer/GfxRenderer.cpp | 11 +++++++++++ lib/GfxRenderer/GfxRenderer.h | 2 ++ .../reader/EpubReaderChapterSelectionActivity.cpp | 4 +++- src/activities/reader/FileSelectionActivity.cpp | 7 +------ 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/lib/GfxRenderer/GfxRenderer.cpp b/lib/GfxRenderer/GfxRenderer.cpp index 0fc4abf..0052272 100644 --- a/lib/GfxRenderer/GfxRenderer.cpp +++ b/lib/GfxRenderer/GfxRenderer.cpp @@ -238,6 +238,17 @@ void GfxRenderer::displayBuffer(const EInkDisplay::RefreshMode refreshMode) cons einkDisplay.displayBuffer(refreshMode); } +std::string GfxRenderer::truncatedText(const int fontId, const char* text, const int maxWidth, + const EpdFontStyle style) const { + std::string item = text; + int itemWidth = getTextWidth(fontId, item.c_str(), style); + while (itemWidth > maxWidth && item.length() > 8) { + item.replace(item.length() - 5, 5, "..."); + itemWidth = getTextWidth(fontId, item.c_str(), style); + } + return item; +} + // Note: Internal driver treats screen in command orientation; this library exposes a logical orientation int GfxRenderer::getScreenWidth() const { switch (orientation) { diff --git a/lib/GfxRenderer/GfxRenderer.h b/lib/GfxRenderer/GfxRenderer.h index 0d7bb88..a636e36 100644 --- a/lib/GfxRenderer/GfxRenderer.h +++ b/lib/GfxRenderer/GfxRenderer.h @@ -75,6 +75,8 @@ class GfxRenderer { int getSpaceWidth(int fontId) const; int getFontAscenderSize(int fontId) const; int getLineHeight(int fontId) const; + std::string truncatedText(const int fontId, const char* text, const int maxWidth, + const EpdFontStyle style = REGULAR) const; // UI Components void drawButtonHints(int fontId, const char* btn1, const char* btn2, const char* btn3, const char* btn4) const; diff --git a/src/activities/reader/EpubReaderChapterSelectionActivity.cpp b/src/activities/reader/EpubReaderChapterSelectionActivity.cpp index 25fa616..1b62135 100644 --- a/src/activities/reader/EpubReaderChapterSelectionActivity.cpp +++ b/src/activities/reader/EpubReaderChapterSelectionActivity.cpp @@ -120,7 +120,9 @@ void EpubReaderChapterSelectionActivity::renderScreen() { const auto pageWidth = renderer.getScreenWidth(); const int pageItems = getPageItems(); - renderer.drawCenteredText(UI_12_FONT_ID, 15, "Select Chapter", true, BOLD); + + std::string title = renderer.truncatedText(UI_12_FONT_ID, epub->getTitle().c_str(), pageWidth - 40, BOLD); + renderer.drawCenteredText(UI_12_FONT_ID, 15, title.c_str(), true, BOLD); const auto pageStartIndex = selectorIndex / pageItems * pageItems; renderer.fillRect(0, 60 + (selectorIndex % pageItems) * 30 - 2, pageWidth - 1, 30); diff --git a/src/activities/reader/FileSelectionActivity.cpp b/src/activities/reader/FileSelectionActivity.cpp index 4510f9b..c7a8d41 100644 --- a/src/activities/reader/FileSelectionActivity.cpp +++ b/src/activities/reader/FileSelectionActivity.cpp @@ -188,12 +188,7 @@ void FileSelectionActivity::render() const { const auto pageStartIndex = selectorIndex / PAGE_ITEMS * PAGE_ITEMS; renderer.fillRect(0, 60 + (selectorIndex % PAGE_ITEMS) * 30 - 2, pageWidth - 1, 30); for (int i = pageStartIndex; i < files.size() && i < pageStartIndex + PAGE_ITEMS; i++) { - auto item = files[i]; - int itemWidth = renderer.getTextWidth(UI_10_FONT_ID, item.c_str()); - while (itemWidth > renderer.getScreenWidth() - 40 && item.length() > 8) { - item.replace(item.length() - 5, 5, "..."); - itemWidth = renderer.getTextWidth(UI_10_FONT_ID, item.c_str()); - } + auto item = renderer.truncatedText(UI_10_FONT_ID, files[i].c_str(), renderer.getScreenWidth() - 40); renderer.drawText(UI_10_FONT_ID, 20, 60 + (i % PAGE_ITEMS) * 30, item.c_str(), i != selectorIndex); }