From e22523b66eb7ccc00c2a9f9fab90dc972d49f798 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 3 Nov 2016 18:38:14 +0100 Subject: [PATCH] Revert "src/gui/widget/textbox.cpp supplement to try to fix text lines per page" This reverts commit 82330c588312a83aee3b3a08bfb2c65a2053c1dd. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/3815694e391025ae44ff21f75d5942cd83a796e5 Author: Jacek Jendrzej Date: 2016-11-03 (Thu, 03 Nov 2016) --- src/gui/widget/textbox.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/gui/widget/textbox.cpp b/src/gui/widget/textbox.cpp index 428063a4f..5651d302c 100644 --- a/src/gui/widget/textbox.cpp +++ b/src/gui/widget/textbox.cpp @@ -310,9 +310,8 @@ void CTextBox::initFramesRel(void) 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,lines_per_page_tmp); - if(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); + if((m_cFrameTextRel.iHeight - (2*text_Vborder_width)) % m_nFontTextHeight) m_nLinesPerPage += 1; #if 0 @@ -468,9 +467,8 @@ void CTextBox::refreshTextLineArray(void) reSizeMainFrameHeight(m_nNrOfLines * 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 = std::max(1, (m_cFrameTextRel.iHeight - (2*text_Vborder_width)) / m_nFontTextHeight); + if((m_cFrameTextRel.iHeight - (2*text_Vborder_width)) % m_nFontTextHeight) m_nLinesPerPage += 1; m_nNrOfPages = ((m_nNrOfLines-1) / m_nLinesPerPage) + 1;