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

Merge branch 'virt-direction'

Browse Source 
Don't extend wxScrolledWindow virtual size beyond its physical size in
non-scrollable direction.

See #18235.
This commit is contained in:
Vadim Zeitlin
2018-10-05 18:53:38 +02:00
parent 162ea7b1ef 180fb2f35b
commit 103881abee
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/generic/scrlwing.cpp
View File

@@ -767,10 +767,18 @@ bool wxScrollHelperBase::ScrollLayout()
// If we're the scroll target, take into account the // If we're the scroll target, take into account the
// virtual size and scrolled position of the window. // virtual size and scrolled position of the window.
int x = 0, y = 0, w = 0, h = 0; wxSize size = m_win->GetVirtualSize();
CalcScrolledPosition(0,0, &x,&y);
m_win->GetVirtualSize(&w, &h); // However we should use the real window size in the direction in which
m_win->GetSizer()->SetDimension(x, y, w, h); // scrolling is disabled, if any.
const wxSize clientSize = m_win->GetClientSize();
if ( !IsScrollbarShown(wxHORIZONTAL) )
size.x = clientSize.x;
if ( !IsScrollbarShown(wxVERTICAL) )
size.y = clientSize.y;
m_win->GetSizer()->SetDimension(CalcScrolledPosition(wxPoint(0, 0)),
size);
return true; return true;
} }