deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Поправка багов

Browse Source
This commit is contained in:
Book Pauk
2020-12-24 00:44:38 +07:00
parent ca1170a9f0
commit 1eac00f71c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/components/Reader/share/BookParser.js
View File

@@ -678,7 +678,7 @@ export default class BookParser {
spaceIndex = i; spaceIndex = i;
if (i - spaceIndex >= maxWordLength && i < p.text.length - 1 && if (i - spaceIndex >= maxWordLength && i < p.text.length - 1 &&
this.measureText(p.text.substr(spaceIndex + 1, i - spaceIndex), p.style) >= this.w - this.p) { this.measureText(p.text.substr(spaceIndex + 1, i - spaceIndex), p.style) >= this.sets.w - this.sets.p) {
result.push({style: p.style, image: p.image, text: p.text.substr(0, i + 1)}); result.push({style: p.style, image: p.image, text: p.text.substr(0, i + 1)});
p = {style: p.style, image: p.image, text: p.text.substr(i + 1)}; p = {style: p.style, image: p.image, text: p.text.substr(i + 1)};
spaceIndex = -1; spaceIndex = -1;
@@ -831,8 +831,8 @@ export default class BookParser {
const maxH = lineCount*parsed.lineHeight; const maxH = lineCount*parsed.lineHeight;
let maxH2 = maxH; let maxH2 = maxH;
if (parsed.imageFitWidth && bin.w > this.w) { if (parsed.imageFitWidth && bin.w > parsed.w) {
maxH2 = bin.h*this.w/bin.w; maxH2 = bin.h*parsed.w/bin.w;
c = Math.ceil(maxH2/parsed.lineHeight); c = Math.ceil(maxH2/parsed.lineHeight);
} }
lineCount = (c < lineCount ? c : lineCount); lineCount = (c < lineCount ? c : lineCount);