Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert patch again, as the scrollbars are now always shown.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2005-02-12 12:36:12 +00:00
parent a2d3a3d1d3
commit bf67b13520
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/generic/scrlwing.cpp
View File

@@ -653,7 +653,7 @@ void wxScrollHelper::AdjustScrollbars()
else else
{ {
int vVirt = m_targetWindow->GetVirtualSize().GetWidth(); int vVirt = m_targetWindow->GetVirtualSize().GetWidth();
m_xScrollLines = (vVirt+m_xScrollPixelsPerLine-1) / m_xScrollPixelsPerLine; m_xScrollLines = vVirt / m_xScrollPixelsPerLine;
// Calculate page size i.e. number of scroll units you get on the // Calculate page size i.e. number of scroll units you get on the
// current client window // current client window
@@ -687,7 +687,7 @@ void wxScrollHelper::AdjustScrollbars()
else // might need scrolling else // might need scrolling
{ {
int hVirt = m_targetWindow->GetVirtualSize().GetHeight(); int hVirt = m_targetWindow->GetVirtualSize().GetHeight();
m_yScrollLines = (hVirt+m_yScrollPixelsPerLine-1) / m_yScrollPixelsPerLine; m_yScrollLines = hVirt / m_yScrollPixelsPerLine;
// Calculate page size i.e. number of scroll units you get on the // Calculate page size i.e. number of scroll units you get on the
// current client window // current client window

8
src/gtk/scrolwin.cpp
View File

@@ -380,8 +380,8 @@ void wxScrolledWindow::AdjustScrollbars()
} }
else else
{ {
m_hAdjust->upper = (vw+m_xScrollPixelsPerLine-1) / m_xScrollPixelsPerLine; m_hAdjust->upper = vw / m_xScrollPixelsPerLine;
m_hAdjust->page_increment = (w / m_xScrollPixelsPerLine); m_hAdjust->page_increment = w / m_xScrollPixelsPerLine;
m_hAdjust->page_size = m_hAdjust->page_increment; m_hAdjust->page_size = m_hAdjust->page_increment;
// If the scrollbar hits the right side, move the window // If the scrollbar hits the right side, move the window
@@ -408,8 +408,8 @@ void wxScrolledWindow::AdjustScrollbars()
} }
else else
{ {
m_vAdjust->upper = (vh+m_yScrollPixelsPerLine-1) / m_yScrollPixelsPerLine; m_vAdjust->upper = vh / m_yScrollPixelsPerLine;
m_vAdjust->page_increment = (h / m_yScrollPixelsPerLine); m_vAdjust->page_increment = h / m_yScrollPixelsPerLine;
m_vAdjust->page_size = m_vAdjust->page_increment; m_vAdjust->page_size = m_vAdjust->page_increment;
if ((m_vAdjust->value != 0.0) && (m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper)) if ((m_vAdjust->value != 0.0) && (m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper))

8
src/gtk1/scrolwin.cpp
View File

@@ -380,8 +380,8 @@ void wxScrolledWindow::AdjustScrollbars()
} }
else else
{ {
m_hAdjust->upper = (vw+m_xScrollPixelsPerLine-1) / m_xScrollPixelsPerLine; m_hAdjust->upper = vw / m_xScrollPixelsPerLine;
m_hAdjust->page_increment = (w / m_xScrollPixelsPerLine); m_hAdjust->page_increment = w / m_xScrollPixelsPerLine;
m_hAdjust->page_size = m_hAdjust->page_increment; m_hAdjust->page_size = m_hAdjust->page_increment;
// If the scrollbar hits the right side, move the window // If the scrollbar hits the right side, move the window
@@ -408,8 +408,8 @@ void wxScrolledWindow::AdjustScrollbars()
} }
else else
{ {
m_vAdjust->upper = (vh+m_yScrollPixelsPerLine-1) / m_yScrollPixelsPerLine; m_vAdjust->upper = vh / m_yScrollPixelsPerLine;
m_vAdjust->page_increment = (h / m_yScrollPixelsPerLine); m_vAdjust->page_increment = h / m_yScrollPixelsPerLine;
m_vAdjust->page_size = m_vAdjust->page_increment; m_vAdjust->page_size = m_vAdjust->page_increment;
if ((m_vAdjust->value != 0.0) && (m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper)) if ((m_vAdjust->value != 0.0) && (m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper))