page numbering in 2-column mode; end-of-section rpocessing in 2-colum…

…n mode (in progress)
geometer · Apr 28, 2013 · 669bb2f · 669bb2f
1 parent e190bfc
commit 669bb2f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/TODO.2pages b/TODO.2pages
@@ -1,9 +1,9 @@
 * FIRST RELEASE
 ** fix end-of-section processing
+** backward scrolling
 
 * OPTIONAL
 ** 3d animation
 ** "half page turning"
 ** footer/header
 ** page delimiter
-** page numbering
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java
@@ -557,7 +557,7 @@ private int sizeOfTextBeforeCursor(ZLTextWordCursor wordCursor) {
 	private synchronized float computeCharsPerPage() {
 		setTextStyle(ZLTextStyleCollection.Instance().getBaseStyle());
 
-		final int textWidth = getTextAreaWidth();
+		final int textWidth = getTextColumnWidth();
 		final int textHeight = getTextAreaHeight();
 
 		final int num = myModel.getParagraphsNumber();
@@ -880,7 +880,11 @@ private void buildInfos(ZLTextPage page, ZLTextWordCursor start, ZLTextWordCurso
 					}
 				}
 			}
-		} 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();
 	}