From d806d6ae7d8d15b0af24d4124f3f2eee2decb372 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 3 Nov 2016 18:38:41 +0100 Subject: [PATCH] Revert "src/gui/widget/textbox.cpp try to fix text lines per page" This reverts commit 3a2876ce226940814e4e290f2000806e9b624317. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2907aa5a37ebe4aaeb287101ce8e3a5c3fcb7bbc Author: Jacek Jendrzej Date: 2016-11-03 (Thu, 03 Nov 2016) ------------------ This commit was generated by Migit --- src/gui/widget/textbox.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/gui/widget/textbox.cpp b/src/gui/widget/textbox.cpp index 5651d302c..7120b7a16 100644 --- a/src/gui/widget/textbox.cpp +++ b/src/gui/widget/textbox.cpp @@ -311,8 +311,6 @@ 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) - m_nLinesPerPage += 1; #if 0 TRACE_1("Frames\r\n\tScren:\t%3d,%3d,%3d,%3d\r\n\tMain:\t%3d,%3d,%3d,%3d\r\n\tText:\t%3d,%3d,%3d,%3d \r\n\tScroll:\t%3d,%3d,%3d,%3d \r\n", @@ -468,8 +466,6 @@ void CTextBox::refreshTextLineArray(void) } 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; if(m_nCurrentPage >= m_nNrOfPages)