Improved SetScrollbars fix using client size and max of window and virtual

sizes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-27 14:17:55 +00:00
parent 85452d7496
commit 0156594543

View File

@@ -340,18 +340,18 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX,
m_xScrollPosition = xPos;
m_yScrollPosition = yPos;
wxSize sz = m_targetWindow->GetSize();
int x = noUnitsX * pixelsPerUnitX;
int y = noUnitsY * pixelsPerUnitY;
if (x == 0)
x = sz.x;
if (y == 0)
y = sz.y;
// For better backward compatibility we set persisting limits
// here not just the size. It makes SetScrollbars 'sticky'
// emulating the old non-autoscroll behaviour.
wxSize sz = m_targetWindow->GetClientSize();
#if 1
int x = wxMax(noUnitsX * pixelsPerUnitX, sz.x);
int y = wxMax(noUnitsY * pixelsPerUnitY, sz.y);
#else
int x = noUnitsX * pixelsPerUnitX;
int y = noUnitsY * pixelsPerUnitY;
#endif
m_targetWindow->SetVirtualSizeHints( x, y );
// The above should arguably be deprecated, this however we still need.