cottongin/crosspoint-reader-mod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Correct word width and space calculations (#963)

Browse Source 
## Summary

**What is the goal of this PR?**

This change fixes an issue I noticed while reading where occasionally,
especially in italics, some words would have too much space between
them. The problem was that word width calculations were including any
negative X overhang, and combined with a space before the word, that can
lead to an inconsistently large space.

## Additional Context

Screenshots of some problematic text:

| In CrossPoint 1.0 | With this change |
| -- | -- |
| <img
src="https://github.com/user-attachments/assets/87bf0e4b-341f-4ba9-b3ea-38c13bd26363"
width="400" /> | <img
src="https://github.com/user-attachments/assets/bf11ba20-c297-4ce1-aa07-43477ef86fc2"
width="400" /> |

---

### AI Usage

While CrossPoint doesn't have restrictions on AI tools in contributing,
please be transparent about their usage as it
helps set the right context for reviewers.

Did you use AI tools to help write this code? _**NO**_
This commit is contained in:
Zach Nelson
2026-02-19 03:44:07 -06:00
committed by cottongin
parent 2bcc1c1495
commit de981f5072
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/GfxRenderer/GfxRenderer.cpp
View File

@@ -808,17 +808,17 @@ int GfxRenderer::getScreenHeight() const {
return HalDisplay::DISPLAY_WIDTH;
}
int GfxRenderer::getSpaceWidth(const int fontId) const {
int GfxRenderer::getSpaceWidth(const int fontId, const EpdFontFamily::Style style) const {
const auto fontIt = fontMap.find(fontId);
if (fontIt == fontMap.end()) {
LOG_ERR("GFX", "Font %d not found", fontId);
return 0;
}
return fontIt->second.getGlyph(' ', EpdFontFamily::REGULAR)->advanceX;
return fontIt->second.getGlyph(' ', style)->advanceX;
}
int GfxRenderer::getTextAdvanceX(const int fontId, const char* text) const {
int GfxRenderer::getTextAdvanceX(const int fontId, const char* text, const EpdFontFamily::Style style) const {
const auto fontIt = fontMap.find(fontId);
if (fontIt == fontMap.end()) {
LOG_ERR("GFX", "Font %d not found", fontId);
@@ -829,7 +829,7 @@ int GfxRenderer::getTextAdvanceX(const int fontId, const char* text) const {
int width = 0;
const auto& font = fontIt->second;
while ((cp = utf8NextCodepoint(reinterpret_cast<const uint8_t**>(&text)))) {
width += font.getGlyph(cp, EpdFontFamily::REGULAR)->advanceX;
width += font.getGlyph(cp, style)->advanceX;
}
return width;
}