1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 02:09:35 +02:00

synchronisation with intro branch

This commit is contained in:
Nikolay Pultsin 2014-12-22 06:00:12 +00:00
parent 617355bf4e
commit 06c1e7fa14

View file

@ -1167,6 +1167,9 @@ public abstract class ZLTextView extends ZLTextViewBase {
} else if (element instanceof ZLTextVideoElement) { } else if (element instanceof ZLTextVideoElement) {
wordOccurred = true; wordOccurred = true;
isVisible = true; isVisible = true;
} else if (element instanceof BookElement) {
wordOccurred = true;
isVisible = true;
} else if (isStyleChangeElement(element)) { } else if (isStyleChangeElement(element)) {
applyStyleChangeElement(element); applyStyleChangeElement(element);
} }
@ -1367,7 +1370,7 @@ public abstract class ZLTextView extends ZLTextViewBase {
wordOccurred = false; wordOccurred = false;
--spaceCounter; --spaceCounter;
} }
} else if (element instanceof ZLTextWord || element instanceof ZLTextImageElement || element instanceof ZLTextVideoElement) { } else if (element instanceof ZLTextWord || element instanceof ZLTextImageElement || element instanceof ZLTextVideoElement || element instanceof BookElement) {
final int height = getElementHeight(element); final int height = getElementHeight(element);
final int descent = getElementDescent(element); final int descent = getElementDescent(element);
final int length = element instanceof ZLTextWord ? ((ZLTextWord)element).Length : 0; final int length = element instanceof ZLTextWord ? ((ZLTextWord)element).Length : 0;