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

fix: restore clock display and fix placeholder cover generation

Browse Source 
- Add clock rendering to BaseTheme::drawHeader() and LyraTheme::drawHeader()
  after battery, before title. Respects clockFormat (OFF/AM-PM/24H) and
  clockSize (Small/Medium/Large) settings.
- Fix PlaceholderCoverGenerator splitWords() to treat newlines, tabs, and
  carriage returns as whitespace delimiters (not just spaces), preventing
  one-character-per-line output from EPUB metadata with embedded newlines.
- Remove drawBorder() from placeholder covers since the UI already draws
  its own frame around book cards.

Made-with: Cursor
This commit is contained in:
cottongin
2026-03-07 21:00:23 -05:00
parent 4627ec95f9
commit f44657aeba
3 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/PlaceholderCover/PlaceholderCoverGenerator.cpp
View File

@@ -235,12 +235,12 @@ int getCharAdvance(const EpdFontData* font, uint32_t cp) {
return glyph->advanceX;
}
/// Split a string into words (splitting on spaces).
/// Split a string into words (splitting on whitespace: space, newline, tab, CR).
std::vector<std::string> splitWords(const std::string& text) {
std::vector<std::string> words;
std::string current;
for (size_t i = 0; i < text.size(); i++) {
if (text[i] == ' ') {
if (text[i] == ' ' || text[i] == '\n' || text[i] == '\r' || text[i] == '\t') {
if (!current.empty()) {
words.push_back(current);
current.clear();
@@ -324,23 +324,17 @@ bool PlaceholderCoverGenerator::generate(const std::string& outputPath, const st
}
// Proportional layout constants based on cover dimensions.
// The device bezel covers ~2-3px on each edge, so we pad inward from the edge.
const int edgePadding = std::max(3, width / 48); // ~10px at 480w, ~3px at 136w
const int borderWidth = std::max(2, width / 96); // ~5px at 480w, ~2px at 136w
const int innerPadding = std::max(4, width / 32); // ~15px at 480w, ~4px at 136w
// Text scaling: 2x for full-size covers, 1x for thumbnails
const int titleScale = (height >= 600) ? 2 : 1;
const int authorScale = (height >= 600) ? 2 : 1; // Author also larger on full covers
const int authorScale = (height >= 600) ? 2 : 1;
// Icon: 2x for full cover, 1x for medium thumb, skip for small
const int iconScale = (height >= 600) ? 2 : (height >= 350 ? 1 : 0);
// Draw border inset from edge
buf.drawBorder(edgePadding, edgePadding, width - 2 * edgePadding, height - 2 * edgePadding, borderWidth);
// Content area (inside border + inner padding)
const int contentX = edgePadding + borderWidth + innerPadding;
const int contentY = edgePadding + borderWidth + innerPadding;
// Content area (the UI draws its own border around book cards)
const int contentX = innerPadding;
const int contentY = innerPadding;
const int contentW = width - 2 * contentX;
const int contentH = height - 2 * contentY;