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

fix: improve UTF-8 safe text truncation in GfxRenderer and update Epub/TxtReaderActivity to use new method

Browse Source
This commit is contained in:
Arthur Tazhitdinov 2026-01-29 02:19:46 +05:00
parent da4d3b5ea5
commit 100724fd2c
3 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/GfxRenderer/GfxRenderer.cpp
View File

@ -2,6 +2,18 @@
#include <Utf8.h>
namespace {
size_t utf8RemoveLastChar(std::string& str) {
if (str.empty()) return 0;
size_t pos = str.size() - 1;
while (pos > 0 && (static_cast<unsigned char>(str[pos]) & 0xC0) == 0x80) {
--pos;
}
str.resize(pos);
return pos;
}
} // namespace
void GfxRenderer::insertFont(const int fontId, EpdFontFamily font) { fontMap.insert({fontId, font}); }
void GfxRenderer::rotateCoordinates(const int x, const int y, int* rotatedX, int* rotatedY) const {
@ -415,13 +427,32 @@ void GfxRenderer::displayBuffer(const HalDisplay::RefreshMode refreshMode) const
std::string GfxRenderer::truncatedText(const int fontId, const char* text, const int maxWidth,
const EpdFontFamily::Style style) const {
std::string item = text;
std::string item = text ? text : "";
if (maxWidth <= 0) {
return "";
}
int itemWidth = getTextWidth(fontId, item.c_str(), style);
while (itemWidth > maxWidth && item.length() > 8) {
item.replace(item.length() - 5, 5, "...");
if (itemWidth <= maxWidth) {
return item;
}
const char* ellipsis = "...";
const int ellipsisWidth = getTextWidth(fontId, ellipsis, style);
if (ellipsisWidth > maxWidth) {
return "";
}
while (!item.empty() && itemWidth + ellipsisWidth > maxWidth) {
utf8RemoveLastChar(item);
itemWidth = getTextWidth(fontId, item.c_str(), style);
}
return item;
if (item.empty()) {
return ellipsis;
}
return item + ellipsis;
}
// Note: Internal driver treats screen in command orientation; this library exposes a logical orientation

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

@ -542,8 +542,8 @@ void EpubReaderActivity::renderStatusBar(const int orientedMarginRight, const in
availableTitleSpace = rendererableScreenWidth - titleMarginLeft - titleMarginRight;
titleMarginLeftAdjusted = titleMarginLeft;
}
while (titleWidth > availableTitleSpace && title.length() > 11) {
title.replace(title.length() - 8, 8, "...");
if (titleWidth > availableTitleSpace) {
title = renderer.truncatedText(SMALL_FONT_ID, title.c_str(), availableTitleSpace);
titleWidth = renderer.getTextWidth(SMALL_FONT_ID, title.c_str());
}
}

4
src/activities/reader/TxtReaderActivity.cpp
View File

@ -565,8 +565,8 @@ void TxtReaderActivity::renderStatusBar(const int orientedMarginRight, const int
std::string title = txt->getTitle();
int titleWidth = renderer.getTextWidth(SMALL_FONT_ID, title.c_str());
while (titleWidth > availableTextWidth && title.length() > 11) {
title.replace(title.length() - 8, 8, "...");
if (titleWidth > availableTextWidth) {
title = renderer.truncatedText(SMALL_FONT_ID, title.c_str(), availableTextWidth);
titleWidth = renderer.getTextWidth(SMALL_FONT_ID, title.c_str());
}