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

splitter doesn't change position when the window containing it is minimized and restored

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-06-20 21:32:00 +00:00
parent 049426fc80
commit a8731351d8
1 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/generic/splitter.cpp
View File

@@ -352,24 +352,54 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
} }
} }
void wxSplitterWindow::OnSize(wxSizeEvent& WXUNUSED(event)) void wxSplitterWindow::OnSize(wxSizeEvent& event)
{ {
int cw, ch; // only process this message if we're not iconized - otherwise iconizing
GetClientSize( &cw, &ch ); // and restoring a window containing the splitter has a funny side effect
if ( m_windowTwo ) // of changing the splitter position!
wxWindow *parent = GetParent();
while ( parent && !parent->IsTopLevel() )
{ {
if ( m_splitMode == wxSPLIT_VERTICAL ) parent = parent->GetParent();
{ }
if ( m_sashPosition >= (cw - 5) )
m_sashPosition = wxMax(10, cw - 40); bool iconized = false;
} wxFrame *frame = wxDynamicCast(parent, wxFrame);
if ( m_splitMode == wxSPLIT_HORIZONTAL ) if ( frame )
{ iconized = frame->IsIconized();
if ( m_sashPosition >= (ch - 5) ) else
m_sashPosition = wxMax(10, ch - 40); {
} wxDialog *dialog = wxDynamicCast(parent, wxDialog);
if ( dialog )
iconized = dialog->IsIconized();
else
wxFAIL_MSG(_T("should have a top level frame or dialog parent!"));
}
if ( iconized )
{
event.Skip();
}
else
{
int cw, ch;
GetClientSize( &cw, &ch );
if ( m_windowTwo )
{
if ( m_splitMode == wxSPLIT_VERTICAL )
{
if ( m_sashPosition >= (cw - 5) )
m_sashPosition = wxMax(10, cw - 40);
}
if ( m_splitMode == wxSPLIT_HORIZONTAL )
{
if ( m_sashPosition >= (ch - 5) )
m_sashPosition = wxMax(10, ch - 40);
}
}
SizeWindows();
} }
SizeWindows();
} }
bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance) bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)