snark13/Xteink-X4-crosspoint-reader
1
0
Fork 0
mirror of https://github.com/daveallie/crosspoint-reader.git synced 2025-12-18 23:27:44 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Compare commits

base: snark13:96a88493cd0270ae6bd6752afb48c4010912f368
Branches Tags
snark13:master
snark13:fix/skip-pagebreak-blocks
snark13:feature/bmp-sleep-screen
snark13:fix/font-readability
snark13:chore/activities
snark13:feature/network-file-upload
snark13:feature/display-single-buffer-mode
snark13:feature/jpg-parser
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:b372353a01b45867bc8f5154cf41519c585a80b4
Branches Tags
snark13:master
snark13:fix/skip-pagebreak-blocks
snark13:feature/bmp-sleep-screen
snark13:fix/font-readability
snark13:chore/activities
snark13:feature/network-file-upload
snark13:feature/display-single-buffer-mode
snark13:feature/jpg-parser
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

No commits in common. "96a88493cd0270ae6bd6752afb48c4010912f368" and "b372353a01b45867bc8f5154cf41519c585a80b4" have entirely different histories.
96a88493cd ... b372353a01

2 changed files with 11 additions and 9 deletions
Show Stats Expand all files Collapse all files

16
lib/Epub/Epub/ParsedText.cpp
View File

@ -27,8 +27,6 @@ void ParsedText::layoutAndExtractLines(const GfxRenderer& renderer, const int fo
const size_t totalWordCount = words.size();
const int pageWidth = renderer.getScreenWidth() - horizontalMargin;
const int spaceWidth = renderer.getSpaceWidth(fontId);
// width of 1em to indent first line of paragraph if Extra Spacing is enabled
const int indentWidth = (!extraParagraphSpacing) ? 1 * renderer.getTextWidth(fontId, "m", REGULAR) : 0;
std::vector<uint16_t> wordWidths;
wordWidths.reserve(totalWordCount);
@ -53,7 +51,7 @@ void ParsedText::layoutAndExtractLines(const GfxRenderer& renderer, const int fo
ans[totalWordCount - 1] = totalWordCount - 1;
for (int i = totalWordCount - 2; i >= 0; --i) {
int currlen = -spaceWidth + indentWidth;
int currlen = -spaceWidth;
dp[i] = MAX_COST;
for (size_t j = i; j < totalWordCount; ++j) {
@ -125,10 +123,12 @@ void ParsedText::layoutAndExtractLines(const GfxRenderer& renderer, const int fo
// Calculate spacing
int spareSpace = pageWidth - lineWordWidthSum;
if (wordWidthIndex == 0) {
// width of 1em to indent first line of paragraph
const int indentWidth = 1 * renderer.getTextWidth(fontId, "m", REGULAR);
if (!extraParagraphSpacing && wordWidthIndex ==0) {
spareSpace -= indentWidth;
}
int spacing = spaceWidth;
const bool isLastLine = lineBreak == totalWordCount;
@ -137,8 +137,10 @@ void ParsedText::layoutAndExtractLines(const GfxRenderer& renderer, const int fo
}
// Calculate initial x position
uint16_t xpos = (wordWidthIndex == 0) ? indentWidth : 0;
uint16_t xpos = 0;
if (!extraParagraphSpacing && wordWidthIndex ==0) {
xpos = indentWidth;
}
if (style == TextBlock::RIGHT_ALIGN) {
xpos = spareSpace - (lineWordCount - 1) * spaceWidth;
} else if (style == TextBlock::CENTER_ALIGN) {