AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't apply gravity before requested sash position was set in wxSplitterWindow.

Browse Source 
Gravity should take effect only after the originally requested sash position
is set as otherwise it's not really taken into account.

Closes #13508.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2011-10-30 19:48:40 +00:00
parent 31174267f8
commit c79d40fe1e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/generic/splitter.cpp
View File

@ -435,7 +435,12 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
return;
}
if ( m_windowTwo )
// Update the sash position if needed.
//
// Notice that we shouldn't do this if the sash position requested by user
// couldn't be set yet as it would never be taken into account at all if we
// modified it before this happens.
if ( m_windowTwo && m_requestedSashPosition == INT_MAX )
{
int w, h;
GetClientSize(&w, &h);
@ -444,13 +449,10 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
int old_size = m_splitMode == wxSPLIT_VERTICAL ? m_lastSize.x : m_lastSize.y;
// Don't do anything if the size didn't really change. In particular,
// it is important that we don't reset our sash position because it's
// out of current range in this case as otherwise the really requested
// position would be lost and never set. Wait until we get a real size
// event with our non-initial size to do it.
// Don't do anything if the size didn't really change.
if ( size != old_size )
{
// Apply gravity if we use it.
int delta = (int) ( (size - old_size)*m_sashGravity );
if ( delta != 0 )
{