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

Backported SetScrollbars bug fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-04-06 12:03:09 +00:00
parent 6c11eb5b41
commit 98a67aa507
5 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/generic/scrlwing.cpp
View File

@@ -344,19 +344,15 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX,
// here not just the size. It makes SetScrollbars 'sticky'
// emulating the old non-autoscroll behaviour.
int w = noUnitsX * pixelsPerUnitX;
int h = noUnitsY * pixelsPerUnitY;
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 );
m_targetWindow->SetVirtualSizeHints( w, h );
// The above should arguably be deprecated, this however we still need.
m_targetWindow->SetVirtualSize( x, y );
m_targetWindow->SetVirtualSize( w, h );
if (do_refresh && !noRefresh)
m_targetWindow->Refresh(TRUE, GetRect());
@@ -887,16 +883,19 @@ void wxScrollHelper::DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) co
// Default OnSize resets scrollbars, if any
void wxScrollHelper::HandleOnSize(wxSizeEvent& WXUNUSED(event))
{
if( m_win->GetAutoLayout() )
if( m_win->GetAutoLayout() || m_targetWindow->GetAutoLayout() )
{
if ( m_targetWindow != m_win )
m_targetWindow->FitInside();
m_win->FitInside();
#if wxUSE_CONSTRAINTS
m_win->Layout();
#endif
// FIXME: Something is really weird here... This should be
// called by FitInside above (and apparently is), yet the
// scrollsub sample will get the scrollbar wrong if resized
// quickly. This masks the bug, but is surely not the right
// answer at all.
AdjustScrollbars();
}
else
AdjustScrollbars();