snark13/Xteink-X4-crosspoint-reader
1
0
Fork 0
mirror of https://github.com/daveallie/crosspoint-reader.git synced 2026-02-06 07:37:37 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Compare commits

base: snark13:6905dbd23ac39fb70d7fda00e50eaa40f90e6ce4
Branches Tags
snark13:master
snark13:release/1.0.0
snark13:feature/crosspoint-font
snark13:0.16.0
snark13:0.15.0
snark13:0.14.0
snark13:0.13.1
snark13:0.13.0
snark13:0.12.0
snark13:0.11.2
snark13:0.11.1
snark13:0.11.0
snark13:0.10.0
snark13:0.9.0
snark13:0.8.1
snark13:0.8.0
snark13:0.7.0
snark13:0.6.0
snark13:0.5.1
snark13:0.5.0
snark13:0.4.0
snark13:0.3.0
snark13:0.2.4
snark13:0.2.3
snark13:0.2.2
snark13:0.2.1
snark13:0.2.0
snark13:0.1.1
snark13:0.1.0
..
compare: snark13:dc030e025d5ae4f3d65d74ee8dbdf53819a1f778
Branches Tags
snark13:release/1.0.0
snark13:master
snark13:feature/crosspoint-font
snark13:0.16.0
snark13:0.15.0
snark13:0.14.0
snark13:0.13.1
snark13:0.13.0
snark13:0.12.0
snark13:0.11.2
snark13:0.11.1
snark13:0.11.0
snark13:0.10.0
snark13:0.9.0
snark13:0.8.1
snark13:0.8.0
snark13:0.7.0
snark13:0.6.0
snark13:0.5.1
snark13:0.5.0
snark13:0.4.0
snark13:0.3.0
snark13:0.2.4
snark13:0.2.3
snark13:0.2.2
snark13:0.2.1
snark13:0.2.0
snark13:0.1.1
snark13:0.1.0

2 Commits
6905dbd23a ... dc030e025d

Author SHA1 Message Date
Dave Allie
dc030e025d
Format 2026-01-21 23:06:02 +11:00
Dave Allie
86cd04f855
Center title on screen, then fallback to centering in available space 2026-01-21 23:02:18 +11:00
1 changed files with 18 additions and 5 deletions
Show Stats Expand all files Collapse all files

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

@ -447,10 +447,16 @@ void EpubReaderActivity::renderStatusBar(const int orientedMarginRight, const in
if (showChapterTitle) {
// Centered chatper title text
// Page width minus existing content with 30px padding on each side
const int rendererableScreenWidth = renderer.getScreenWidth() - orientedMarginLeft - orientedMarginRight;
const int batterySize = showBattery ? (showBatteryPercentage ? 50 : 20) : 0;
const int titleMarginLeft = batterySize + 30 + orientedMarginLeft;
const int titleMarginRight = progressTextWidth + 30 + orientedMarginRight;
const int availableTextWidth = renderer.getScreenWidth() - titleMarginLeft - titleMarginRight;
const int titleMarginLeft = batterySize + 30;
const int titleMarginRight = progressTextWidth + 30;
// Attempt to center title on the screen, but if title is too wide then later we will center it within the
// available space.
int titleMarginLeftAdjusted = std::max(titleMarginLeft, titleMarginRight);
int availableTitleSpace = rendererableScreenWidth - 2 * titleMarginLeftAdjusted;
const int tocIndex = epub->getTocIndexForSpineIndex(currentSpineIndex);
std::string title;
@ -462,12 +468,19 @@ void EpubReaderActivity::renderStatusBar(const int orientedMarginRight, const in
const auto tocItem = epub->getTocItem(tocIndex);
title = tocItem.title;
titleWidth = renderer.getTextWidth(SMALL_FONT_ID, title.c_str());
while (titleWidth > availableTextWidth && title.length() > 11) {
if (titleWidth > availableTitleSpace) {
// Not enough space to center on the screen, center it within the remaining space instead
availableTitleSpace = rendererableScreenWidth - titleMarginLeft - titleMarginRight;
titleMarginLeftAdjusted = titleMarginLeft;
}
while (titleWidth > availableTitleSpace && title.length() > 11) {
title.replace(title.length() - 8, 8, "...");
titleWidth = renderer.getTextWidth(SMALL_FONT_ID, title.c_str());
}
}
renderer.drawText(SMALL_FONT_ID, titleMarginLeft + (availableTextWidth - titleWidth) / 2, textY, title.c_str());
renderer.drawText(SMALL_FONT_ID,
titleMarginLeftAdjusted + orientedMarginLeft + (availableTitleSpace - titleWidth) / 2, textY,
title.c_str());
}
}