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

Fixed bug in FlexGridSizer mods that prevented them from ever shrinking.

Browse Source 
Reverted the earlier SetScrollbars patch and fixed a bug in GetVirtualSize
that was hopefully the real cause of all the preceding woe.

Added a comment and a kludge for a most unusual bug manifesting in the
scrollsub sample.  If it is resized quickly size events appear to get lost
and the scrollbar is set incorrectly.  Adding an extra call to
AdjustScrollbars masks the problem, though its clearly superfluous since
the FitInside above already calls it.  This seems to be a brand new problem
(on both Gtk and msw) as of some time prior to this patch and it should be
looked into further.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2003-01-27 09:02:58 +00:00
parent dd91da4ed1
commit 150c8d89c7
5 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/generic/scrlwing.cpp
View File

@@ -344,23 +344,18 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX,
m_xScrollPosition = xPos;
m_yScrollPosition = yPos;
int w = noUnitsX * pixelsPerUnitX;
int h = noUnitsY * pixelsPerUnitY;
// 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 );
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());
@@ -891,16 +886,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();