Applied [ 612802 ] wxSplitterWindow::Unsplit() in wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -107,8 +107,8 @@ void wxSplitterWindow::Init()
|
||||
m_oldY = 0;
|
||||
m_firstX = 0;
|
||||
m_firstY = 0;
|
||||
m_sashSize = 7;
|
||||
m_borderSize = 2;
|
||||
m_sashSize = 3;
|
||||
m_borderSize = 0;
|
||||
m_sashPosition = m_requestedSashPosition = 0;
|
||||
m_minimumPaneSize = 0;
|
||||
m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE);
|
||||
@@ -121,9 +121,6 @@ void wxSplitterWindow::Init()
|
||||
m_facePen = (wxPen *) NULL;
|
||||
m_hilightPen = (wxPen *) NULL;
|
||||
|
||||
m_borderSize = 0;
|
||||
m_sashSize = 3;
|
||||
|
||||
InitColours();
|
||||
|
||||
m_needUpdating = FALSE;
|
||||
@@ -214,6 +211,12 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
|
||||
m_dragMode = wxSPLIT_DRAG_NONE;
|
||||
ReleaseMouse();
|
||||
|
||||
// exit if unsplit after doubleclick
|
||||
if ( !IsSplit() )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Erase old tracker
|
||||
if ( !isLive )
|
||||
{
|
||||
@@ -754,7 +757,8 @@ void wxSplitterWindow::SizeWindows()
|
||||
DoSetSashPosition(newSashPosition);
|
||||
}
|
||||
|
||||
if ( newSashPosition == m_sashPosition )
|
||||
if ( newSashPosition <= m_sashPosition
|
||||
&& newSashPosition >= m_sashPosition - GetBorderSize() )
|
||||
{
|
||||
// don't update it any more
|
||||
m_requestedSashPosition = INT_MAX;
|
||||
|
Reference in New Issue
Block a user