From: Robert Roebling Date: Sat, 12 Feb 2005 08:51:53 +0000 (+0000) Subject: ALso correct scrollbar calc to not clip division remainder X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bf06fe48ad00f107290bc33923a01b34331c1eac ALso correct scrollbar calc to not clip division remainder from the displayed area. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp index e2c3e6694d..d97d6ab1bc 100644 --- a/src/generic/scrlwing.cpp +++ b/src/generic/scrlwing.cpp @@ -652,7 +652,8 @@ void wxScrollHelper::AdjustScrollbars() } else { - m_xScrollLines = m_targetWindow->GetVirtualSize().GetWidth() / m_xScrollPixelsPerLine; + int vVirt = m_targetWindow->GetVirtualSize().GetWidth(); + m_xScrollLines = (vVirt+m_xScrollPixelsPerLine-1) / m_xScrollPixelsPerLine; // Calculate page size i.e. number of scroll units you get on the // current client window @@ -686,7 +687,7 @@ void wxScrollHelper::AdjustScrollbars() else // might need scrolling { int hVirt = m_targetWindow->GetVirtualSize().GetHeight(); - m_yScrollLines = hVirt / m_yScrollPixelsPerLine; + m_yScrollLines = (hVirt+m_yScrollPixelsPerLine-1) / m_yScrollPixelsPerLine; // Calculate page size i.e. number of scroll units you get on the // current client window