mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 02:11:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit e26ad6e9f1.
This commit is contained in:
Jacek Jendrzej
2016-11-03 18:38:14 +01:00
parent e26ad6e9f1
commit 3815694e39
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/widget/textbox.cpp
View File

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