eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: display empty lines in txt reader (#1841)

Browse Source
This commit is contained in:
Uri Tauber
2026-05-07 09:07:57 +03:00
committed by GitHub
parent 11bc36ebb5
commit dadce519c4
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/activities/reader/TxtReaderActivity.cpp
+10 -4
View File
@@ -19,7 +19,7 @@ namespace {
constexpr size_t CHUNK_SIZE = 8 * 1024; // 8KB chunk for reading constexpr size_t CHUNK_SIZE = 8 * 1024; // 8KB chunk for reading
// Cache file magic and version // Cache file magic and version
constexpr uint32_t CACHE_MAGIC = 0x54585449; // "TXTI" constexpr uint32_t CACHE_MAGIC = 0x54585449; // "TXTI"
constexpr uint8_t CACHE_VERSION = 2; // Increment when cache format changes constexpr uint8_t CACHE_VERSION = 3; // Increment when cache format changes
} // namespace } // namespace
void TxtReaderActivity::onEnter() { void TxtReaderActivity::onEnter() {
@@ -223,8 +223,14 @@ bool TxtReaderActivity::loadPageAtOffset(size_t offset, std::vector<std::string>
// Track position within this source line (in bytes from pos) // Track position within this source line (in bytes from pos)
size_t lineBytePos = 0; size_t lineBytePos = 0;
// Word wrap if needed // Emit at least one visual line for each source line (including blank lines),
while (!line.empty() && static_cast<int>(outLines.size()) < linesPerPage) { // then continue with wrapping when needed.
do {
if (line.empty()) {
outLines.emplace_back();
break;
}
int lineWidth = renderer.getTextWidth(cachedFontId, line.c_str()); int lineWidth = renderer.getTextWidth(cachedFontId, line.c_str());
if (lineWidth <= viewportWidth) { if (lineWidth <= viewportWidth) {
@@ -264,7 +270,7 @@ bool TxtReaderActivity::loadPageAtOffset(size_t offset, std::vector<std::string>
} }
lineBytePos += skipChars; lineBytePos += skipChars;
line = line.substr(skipChars); line = line.substr(skipChars);
} } while (!line.empty() && static_cast<int>(outLines.size()) < linesPerPage);
// Determine how much of the source buffer we consumed // Determine how much of the source buffer we consumed
if (line.empty()) { if (line.empty()) {