crengine: add pageHeader and top/bottom margins in SCROLL mode (and TTS)

Author: teleshoes

crengine/src/lvdocview.cpp

@@ -2452,7 +2452,7 @@ void LVDocView::Draw(LVDrawBuf & drawbuf, int position, int page, bool rotate, b
 		return;
 	if (isScrollMode()) {
 		drawbuf.SetClipRect(NULL);
-        drawbuf.setHidePartialGlyphs(false);
+        drawbuf.setHidePartialGlyphs(true);
         drawPageBackground(drawbuf, 0, position);
         int cover_height = 0;
 		if (m_pages.length() > 0 && (m_pages[0]->flags & RN_PAGE_TYPE_COVER))
@@ -2468,9 +2468,37 @@ void LVDocView::Draw(LVDrawBuf & drawbuf, int position, int page, bool rotate, b
 			rc.right -= m_pageMargins.right;
 			drawCoverTo(&drawbuf, rc);
 		}
-		DrawDocument(drawbuf, m_doc->getRootNode(), m_pageMargins.left, 0, drawbuf.GetWidth()
-				- m_pageMargins.left - m_pageMargins.right, drawbuf.GetHeight(), 0, -position,
-				drawbuf.GetHeight(), &m_markRanges, &m_bmkRanges);
+
+		int curPage = m_pages.FindNearestPage(position, 0);
+		int totalPages = m_pages.length();
+
+		lvRect info;
+		getPageHeaderRectangle(curPage, info);
+		drawPageHeader(&drawbuf, info, curPage, m_pageHeaderInfo, totalPages);
+
+		int top = m_pageMargins.top
+		  + (PAGE_HEADER_POS_TOP == m_pageHeaderPos ? info.height() : 0);
+		int left = m_pageMargins.left;
+
+		int contentWidth = drawbuf.GetWidth()
+		  - left
+		  - m_pageMargins.right;
+		int contentHeight = drawbuf.GetHeight()
+		  - top
+		  - m_pageMargins.bottom;
+
+		lvRect clip;
+		clip.top = top;
+		clip.bottom = top + contentHeight;
+		//do not clip left/right
+		//  (ignore left/right margins, allow partial glyphs to dangle)
+		clip.left = 0;
+		clip.right = drawbuf.GetWidth();
+
+		drawbuf.SetClipRect(&clip);
+
+		DrawDocument(drawbuf, m_doc->getRootNode(), left, top, contentWidth,
+		    contentHeight, 0, -position, m_dy, &m_markRanges, &m_bmkRanges);
 	} else {
 		int pc = getVisiblePageCount();
 		//CRLog::trace("searching for page with offset=%d", position);
@@ -2510,7 +2538,8 @@ bool LVDocView::windowToDocPoint(lvPoint & pt) {
 #endif
 	if (getViewMode() == DVM_SCROLL) {
 		// SCROLL mode
-		pt.y += _pos;
+		int headerHeight = (PAGE_HEADER_POS_TOP == m_pageHeaderPos) ? getPageHeaderHeight() : 0;
+		pt.y += _pos + m_pageMargins.top + headerHeight;
 		pt.x -= m_pageMargins.left;
 		return true;
 	} else {
@@ -2558,7 +2587,8 @@ bool LVDocView::docToWindowPoint(lvPoint & pt, bool isRectBottom, bool fitToPage
 	// TODO: implement coordinate conversion here
 	if (getViewMode() == DVM_SCROLL) {
 		// SCROLL mode
-		pt.y -= _pos;
+		int headerHeight = (PAGE_HEADER_POS_TOP == m_pageHeaderPos) ? getPageHeaderHeight() : 0;
+		pt.y -= _pos + m_pageMargins.top + headerHeight;
 		pt.x += m_pageMargins.left;
 		return true;
 	} else {