yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 01:39:18 +02:00
Code Issues Releases Wiki Activity

page numbering in 2-column mode; end-of-section rpocessing in 2-column mode (in progress)

Browse source
This commit is contained in:
Nikolay Pultsin 2013-04-29 00:26:45 +02:00
parent e190bfc3e8
commit 669bb2f64e
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TODO.2pages
View file

@ -1,9 +1,9 @@
* FIRST RELEASE * FIRST RELEASE
** fix end-of-section processing ** fix end-of-section processing
** backward scrolling
* OPTIONAL * OPTIONAL
** 3d animation ** 3d animation
** "half page turning" ** "half page turning"
** footer/header ** footer/header
** page delimiter ** page delimiter
** page numbering

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

@ -557,7 +557,7 @@ public abstract class ZLTextView extends ZLTextViewBase {
private synchronized float computeCharsPerPage() { private synchronized float computeCharsPerPage() {
setTextStyle(ZLTextStyleCollection.Instance().getBaseStyle()); setTextStyle(ZLTextStyleCollection.Instance().getBaseStyle());
final int textWidth = getTextAreaWidth(); final int textWidth = getTextColumnWidth();
final int textHeight = getTextAreaHeight(); final int textHeight = getTextAreaHeight();
final int num = myModel.getParagraphsNumber(); final int num = myModel.getParagraphsNumber();
@ -880,7 +880,11 @@ public abstract class ZLTextView extends ZLTextViewBase {
} }
} }
} }
} while (result.isEndOfParagraph() && result.nextParagraph() && !result.getParagraphCursor().isEndOfSection() && textAreaHeight >= 0); } while (result.isEndOfParagraph() && result.nextParagraph() && textAreaHeight >= 0 &&
(!result.getParagraphCursor().isEndOfSection() ||
(page.twoColumnView() && page.LineInfos.size() == page.Column0Height)
)
);
resetTextStyle(); resetTextStyle();
} }