yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into highlighting

Browse source
This commit is contained in:
Nikolay Pultsin 2014-09-26 09:39:57 +01:00
commit 02b0104d56
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/org/geometerplus/zlibrary/text/view/ZLTextView.java
View file

@ -528,7 +528,7 @@ public abstract class ZLTextView extends ZLTextViewBase {
y = getTopMargin(); y = getTopMargin();
index = 0; index = 0;
for (ZLTextLineInfo info : lineInfos) { for (ZLTextLineInfo info : lineInfos) {
drawTextLine(page, info, labels[index], labels[index + 1]); drawTextLine(page, hilites, info, labels[index], labels[index + 1]);
y += info.Height + info.Descent + info.VSpaceAfter; y += info.Height + info.Descent + info.VSpaceAfter;
++index; ++index;
if (index == page.Column0Height) { if (index == page.Column0Height) {
@ -883,7 +883,7 @@ public abstract class ZLTextView extends ZLTextViewBase {
protected abstract ZLPaintContext.ColorAdjustingMode getAdjustingModeForImages(); protected abstract ZLPaintContext.ColorAdjustingMode getAdjustingModeForImages();
private static final char[] SPACE = new char[] { ' ' }; private static final char[] SPACE = new char[] { ' ' };
private void drawTextLine(ZLTextPage page, ZLTextLineInfo info, int from, int to) { private void drawTextLine(ZLTextPage page, List<ZLTextHighlighting> hilites, ZLTextLineInfo info, int from, int to) {
final ZLPaintContext context = getContext(); final ZLPaintContext context = getContext();
final ZLTextParagraphCursor paragraph = info.ParagraphCursor; final ZLTextParagraphCursor paragraph = info.ParagraphCursor;
int index = from; int index = from;