src/gui/widget/textbox.cpp supplement to try to fix text lines per page

Origin commit data
------------------
Branch: ni/coolstream
Commit: e26ad6e9f1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-03 (Thu, 03 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2016-11-03 12:51:31 +01:00
parent 3a2876ce22
commit be4173bff6

View File

@@ -310,8 +310,9 @@ void CTextBox::initFramesRel(void)
m_cFrameTextRel.iWidth = m_cFrame.iWidth - m_cFrameScrollRel.iWidth;
m_nLinesPerPage = std::max(1, (m_cFrameTextRel.iHeight - (2*text_Vborder_width)) / m_nFontTextHeight);
if((m_cFrameTextRel.iHeight - (2*text_Vborder_width)) % m_nFontTextHeight)
int lines_per_page_tmp = (m_cFrameTextRel.iHeight - (2*text_Vborder_width)) / m_nFontTextHeight;
m_nLinesPerPage = std::max(1,lines_per_page_tmp);
if(lines_per_page_tmp && (m_cFrameTextRel.iHeight - (2*text_Vborder_width)) % m_nFontTextHeight)
m_nLinesPerPage += 1;
#if 0
@@ -467,8 +468,9 @@ void CTextBox::refreshTextLineArray(void)
reSizeMainFrameHeight(m_nNrOfLines * m_nFontTextHeight);
}
m_nLinesPerPage = std::max(1, (m_cFrameTextRel.iHeight - (2*text_Vborder_width)) / m_nFontTextHeight);
if((m_cFrameTextRel.iHeight - (2*text_Vborder_width)) % m_nFontTextHeight)
int lines_per_page_tmp = (m_cFrameTextRel.iHeight - (2*text_Vborder_width)) / m_nFontTextHeight;
m_nLinesPerPage = std::max(1, lines_per_page_tmp);
if(lines_per_page_tmp && (m_cFrameTextRel.iHeight - (2*text_Vborder_width)) % m_nFontTextHeight)
m_nLinesPerPage += 1;
m_nNrOfPages = ((m_nNrOfLines-1) / m_nLinesPerPage) + 1;