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

fixed wxScrolledWindow best size calculation: compute something (this was broken after 2.8) and don't use current size in computation; also removed now-unused ScrollGetWindowSizeForVirtualSize() method to simplify the code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-12-21 22:47:55 +00:00
parent 8a6a997fb0
commit 7d616e99ed
3 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/generic/scrlwing.cpp
View File

@@ -35,10 +35,9 @@
#include "wx/utils.h"
#include "wx/panel.h"
#include "wx/dcclient.h"
#if wxUSE_TIMER
#include "wx/timer.h"
#endif
#include "wx/timer.h"
#include "wx/sizer.h"
#include "wx/settings.h"
#endif
#ifdef __WXMAC__
@@ -1059,29 +1058,6 @@ wxSize wxScrollHelper::ScrollGetBestVirtualSize() const
return clientSize;
}
// return the window best size from the given best virtual size
wxSize
wxScrollHelper::ScrollGetWindowSizeForVirtualSize(const wxSize& size) const
{
// Only use the content to set the window size in the direction
// where there's no scrolling; otherwise we're going to get a huge
// window in the direction in which scrolling is enabled
int ppuX, ppuY;
GetScrollPixelsPerUnit(&ppuX, &ppuY);
wxSize minSize = m_win->GetMinSize();
if ( !minSize.IsFullySpecified() )
minSize = m_win->GetSize();
wxSize best(size);
if (ppuX > 0)
best.x = minSize.x;
if (ppuY > 0)
best.y = minSize.y;
return best;
}
// ----------------------------------------------------------------------------
// event handlers
// ----------------------------------------------------------------------------
@@ -1470,6 +1446,46 @@ void wxScrolledWindow::OnPaint(wxPaintEvent& event)
event.Skip();
}
wxSize wxScrolledWindow::DoGetBestSize() const
{
// NB: We don't do this in WX_FORWARD_TO_SCROLL_HELPER, because not
// all scrollable windows should behave like this, only those that
// contain children controls within scrollable area
// (i.e., wxScrolledWindow) and other some scrollable windows may
// have different DoGetBestSize() implementation (e.g. wxTreeCtrl).
wxSize best = wxPanel::DoGetBestSize();
if ( GetAutoLayout() )
{
// Only use the content to set the window size in the direction
// where there's no scrolling; otherwise we're going to get a huge
// window in the direction in which scrolling is enabled
int ppuX, ppuY;
GetScrollPixelsPerUnit(&ppuX, &ppuY);
// NB: This code used to use *current* size if min size wasn't
// specified, presumably to get some reasonable (i.e., larger than
// minimal) size. But that's a wrong thing to do in GetBestSize(),
// so we use minimal size as specified. If the app needs some
// minimal size for its scrolled window, it should set it and put
// the window into sizer as expandable so that it can use all space
// available to it.
//
// See also http://svn.wxwidgets.org/viewvc/wx?view=rev&revision=45864
wxSize minSize = GetMinSize();
if ( ppuX > 0 )
best.x = minSize.x + wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
if ( ppuY > 0 )
best.y = minSize.y + wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y);
}
return best;
}
#ifdef __WXMSW__
WXLRESULT wxScrolledWindow::MSWWindowProc(WXUINT nMsg,
WXWPARAM wParam,