X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c679789bdbc8b42b7b71828b0f02f97614ee574..50494a55ae4f0ec07a15b811dbcce5a8ae9fc7bc:/src/generic/splitter.cpp diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index dd3ea592ab..31aea495e1 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -21,7 +21,9 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" + #include "wx/window.h" + #include "wx/dialog.h" + #include "wx/frame.h" #endif #include @@ -29,14 +31,15 @@ #include "wx/string.h" #include "wx/splitter.h" #include "wx/dcscreen.h" +#include "wx/settings.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxCommandEvent) BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow) EVT_PAINT(wxSplitterWindow::OnPaint) EVT_SIZE(wxSplitterWindow::OnSize) + EVT_IDLE(wxSplitterWindow::OnIdle) EVT_MOUSE_EVENTS(wxSplitterWindow::OnMouseEvent) EVT_SPLITTER_SASH_POS_CHANGED(-1, wxSplitterWindow::OnSashPosChanged) @@ -46,7 +49,6 @@ BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow) EVT_SPLITTER_DCLICK(-1, wxSplitterWindow::OnDoubleClick) EVT_SPLITTER_UNSPLIT(-1, wxSplitterWindow::OnUnsplitEvent) END_EVENT_TABLE() -#endif wxSplitterWindow::wxSplitterWindow() { @@ -72,6 +74,7 @@ wxSplitterWindow::wxSplitterWindow() m_facePen = (wxPen *) NULL; m_hilightPen = (wxPen *) NULL; m_minimumPaneSize = 0; + m_needUpdating = FALSE; } wxSplitterWindow::wxSplitterWindow(wxWindow *parent, wxWindowID id, @@ -125,6 +128,8 @@ wxSplitterWindow::wxSplitterWindow(wxWindow *parent, wxWindowID id, // For debugging purposes, to see the background. // SetBackground(wxBLUE_BRUSH); + + m_needUpdating = FALSE; } wxSplitterWindow::~wxSplitterWindow() @@ -149,11 +154,16 @@ void wxSplitterWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) DrawSash(dc); } +void wxSplitterWindow::OnIdle(wxIdleEvent& WXUNUSED(event)) +{ + if (m_needUpdating) + SizeWindows(); +} void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) { - long x = event.GetX(); - long y = event.GetY(); + wxCoord x = (wxCoord)event.GetX(), + y = (wxCoord)event.GetY(); // reset the cursor #ifdef __WXMOTIF__ @@ -163,15 +173,6 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) SetCursor(wxCursor()); #endif - // under wxGTK the method above causes the mouse - // to flicker so we set the standard cursor only - // when leaving the window and when moving over - // non-sash parts of the window. this should work - // on the other platforms as well, but who knows. -#ifdef __WXGTK__ - if (event.Leaving()) - SetCursor(* wxSTANDARD_CURSOR); -#endif if (event.LeftDown()) { @@ -181,7 +182,11 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) m_dragMode = wxSPLIT_DRAG_DRAGGING; - DrawSashTracker(x, y); + if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0) + { + DrawSashTracker(x, y); + } + m_oldX = x; m_oldY = y; return; @@ -194,7 +199,10 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) ReleaseMouse(); // Erase old tracker - DrawSashTracker(m_oldX, m_oldY); + if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0) + { + DrawSashTracker(m_oldX, m_oldY); + } // Obtain window size. We are only interested in the dimension the sash // splits up @@ -272,7 +280,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) } #endif // __WXGTK__ } - else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) + else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) { // Obtain window size. We are only interested in the dimension the sash // splits up @@ -293,7 +301,10 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) } // Erase old tracker - DrawSashTracker(m_oldX, m_oldY); + if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0) + { + DrawSashTracker(m_oldX, m_oldY); + } if (m_splitMode == wxSPLIT_VERTICAL) x = new_sash_position; @@ -321,7 +332,15 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) #endif // __WXMSW__ // Draw new one - DrawSashTracker(m_oldX, m_oldY); + if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0) + { + DrawSashTracker(m_oldX, m_oldY); + } + else + { + m_sashPosition = new_sash_position; + m_needUpdating = TRUE; + } } else if ( event.LeftDClick() ) { @@ -334,24 +353,54 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) } } -void wxSplitterWindow::OnSize(wxSizeEvent& WXUNUSED(event)) +void wxSplitterWindow::OnSize(wxSizeEvent& event) { - int cw, ch; - GetClientSize( &cw, &ch ); - if ( m_windowTwo ) + // only process this message if we're not iconized - otherwise iconizing + // and restoring a window containing the splitter has a funny side effect + // of changing the splitter position! + wxWindow *parent = GetParent(); + while ( parent && !parent->IsTopLevel() ) { - if ( m_splitMode == wxSPLIT_VERTICAL ) - { - if ( m_sashPosition >= (cw - 5) ) - m_sashPosition = wxMax(10, cw - 40); - } - if ( m_splitMode == wxSPLIT_HORIZONTAL ) + parent = parent->GetParent(); + } + + bool iconized = FALSE; + wxFrame *frame = wxDynamicCast(parent, wxFrame); + if ( frame ) + iconized = frame->IsIconized(); + else + { + wxDialog *dialog = wxDynamicCast(parent, wxDialog); + if ( dialog ) + iconized = dialog->IsIconized(); + else + wxFAIL_MSG(wxT("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_sashPosition >= (ch - 5) ) - m_sashPosition = wxMax(10, ch - 40); + 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) @@ -373,8 +422,6 @@ bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance) else return FALSE; } - - return FALSE; } // Draw 3D effect borders @@ -385,22 +432,30 @@ void wxSplitterWindow::DrawBorders(wxDC& dc) if ( GetWindowStyleFlag() & wxSP_3D ) { + + dc.SetPen(*m_facePen); + dc.SetBrush(*m_faceBrush); + dc.DrawRectangle(1, 1 , w-1, m_borderSize-2 ); //high + dc.DrawRectangle(1, m_borderSize-2 , m_borderSize-2, h-1 ); // left + dc.DrawRectangle(w-m_borderSize+2, m_borderSize-2 , w-1, h-1 ); // right + dc.DrawRectangle(m_borderSize-2, h-m_borderSize+2 , w-m_borderSize+2, h-1 ); //bottom + dc.SetPen(*m_mediumShadowPen); - dc.DrawLine(0, 0, w-1, 0); - dc.DrawLine(0, 0, 0, h - 1); + dc.DrawLine(m_borderSize-2, m_borderSize-2, w-m_borderSize+1, m_borderSize-2); + dc.DrawLine(m_borderSize-2, m_borderSize-2, m_borderSize-2, h-m_borderSize+1); dc.SetPen(*m_darkShadowPen); - dc.DrawLine(1, 1, w-2, 1); - dc.DrawLine(1, 1, 1, h-2); + dc.DrawLine(m_borderSize-1, m_borderSize-1, w-m_borderSize, m_borderSize-1); + dc.DrawLine(m_borderSize-1, m_borderSize-1, m_borderSize-1, h-m_borderSize); dc.SetPen(*m_hilightPen); - dc.DrawLine(0, h-1, w-1, h-1); - dc.DrawLine(w-1, 0, w-1, h); // Surely the maximum y pos. should be h - 1. + dc.DrawLine(m_borderSize - 2, h-m_borderSize+1, w-m_borderSize+1, h-m_borderSize+1); + dc.DrawLine(w-m_borderSize+1, m_borderSize - 2, w-m_borderSize+1, h-m_borderSize+2); // Surely the maximum y pos. should be h - 1. /// Anyway, h is required for MSW. dc.SetPen(*m_lightShadowPen); - dc.DrawLine(w-2, 1, w-2, h-2); // Right hand side - dc.DrawLine(1, h-2, w-1, h-2); // Bottom + dc.DrawLine(w-m_borderSize, m_borderSize-1, w-m_borderSize, h-m_borderSize); // Right hand side + dc.DrawLine(m_borderSize-1, h-m_borderSize, w-m_borderSize+1, h-m_borderSize); // Bottom } else if ( GetWindowStyleFlag() & wxSP_BORDER ) { @@ -428,41 +483,43 @@ void wxSplitterWindow::DrawSash(wxDC& dc) { dc.SetPen(*m_facePen); dc.SetBrush(*m_faceBrush); - dc.DrawRectangle(m_sashPosition + 2, 0, m_sashSize - 4, h); + dc.DrawRectangle(m_sashPosition + 2, 0 , m_sashSize - 4, h ); dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.SetPen(*m_lightShadowPen); - dc.DrawLine(m_sashPosition, 1, m_sashPosition, h-2); + int xShadow = m_borderSize ? m_borderSize - 1 : 0 ; + dc.DrawLine(m_sashPosition, xShadow , m_sashPosition, h-m_borderSize); dc.SetPen(*m_hilightPen); - dc.DrawLine(m_sashPosition+1, 0, m_sashPosition+1, h); + dc.DrawLine(m_sashPosition+1, m_borderSize - 2, m_sashPosition+1, h - m_borderSize+2); dc.SetPen(*m_mediumShadowPen); - dc.DrawLine(m_sashPosition+m_sashSize-2, 1, m_sashPosition+m_sashSize-2, h-1); + int yMedium = m_borderSize ? h-m_borderSize+1 : h ; + dc.DrawLine(m_sashPosition+m_sashSize-2, xShadow, m_sashPosition+m_sashSize-2, yMedium); dc.SetPen(*m_darkShadowPen); - dc.DrawLine(m_sashPosition+m_sashSize-1, 2, m_sashPosition+m_sashSize-1, h-2); + dc.DrawLine(m_sashPosition+m_sashSize-1, m_borderSize, m_sashPosition+m_sashSize-1, h-m_borderSize ); } else { dc.SetPen(*m_facePen); dc.SetBrush(*m_faceBrush); - dc.DrawRectangle(0, m_sashPosition + 2, w, m_sashSize - 4); + dc.DrawRectangle( m_borderSize-2, m_sashPosition + 2, w-m_borderSize+2, m_sashSize - 4); dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.SetPen(*m_lightShadowPen); - dc.DrawLine(1, m_sashPosition, w-2, m_sashPosition); + dc.DrawLine(m_borderSize-1, m_sashPosition, w-m_borderSize, m_sashPosition); dc.SetPen(*m_hilightPen); - dc.DrawLine(0, m_sashPosition+1, w, m_sashPosition+1); + dc.DrawLine(m_borderSize-2, m_sashPosition+1, w-m_borderSize+1, m_sashPosition+1); dc.SetPen(*m_mediumShadowPen); - dc.DrawLine(1, m_sashPosition+m_sashSize-2, w-1, m_sashPosition+m_sashSize-2); + dc.DrawLine(m_borderSize-1, m_sashPosition+m_sashSize-2, w-m_borderSize+1, m_sashPosition+m_sashSize-2); dc.SetPen(*m_darkShadowPen); - dc.DrawLine(2, m_sashPosition+m_sashSize-1, w-2, m_sashPosition+m_sashSize-1); + dc.DrawLine(m_borderSize, m_sashPosition+m_sashSize-1, w-m_borderSize, m_sashPosition+m_sashSize-1); } } else @@ -560,9 +617,7 @@ void wxSplitterWindow::SizeWindows() if ( m_windowOne && !m_windowTwo ) { m_windowOne->SetSize(m_borderSize, m_borderSize, w - 2*m_borderSize, h - 2*m_borderSize); - - if (m_windowOne->GetAutoLayout()) - m_windowOne->Layout(); + } else if ( m_windowOne && m_windowTwo ) { @@ -580,11 +635,7 @@ void wxSplitterWindow::SizeWindows() m_windowOne->SetSize(x1, y1, w1, h1); m_windowTwo->SetSize(x2, y2, w2, h2); - - if (m_windowOne->GetAutoLayout()) - m_windowOne->Layout(); - if (m_windowTwo->GetAutoLayout()) - m_windowTwo->Layout(); + } else { @@ -592,20 +643,13 @@ void wxSplitterWindow::SizeWindows() w - 2*m_borderSize, m_sashPosition - m_borderSize); m_windowTwo->SetSize(m_borderSize, m_sashPosition + m_sashSize, w - 2*m_borderSize, h - 2*m_borderSize - m_sashSize - (m_sashPosition - m_borderSize)); - - if (m_windowOne->GetAutoLayout()) - m_windowOne->Layout(); - if (m_windowTwo->GetAutoLayout()) - m_windowTwo->Layout(); + } } -#ifdef __WXGTK__ - Refresh(); -#else wxClientDC dc(this); - DrawBorders(dc); + if ( m_borderSize > 0 ) + DrawBorders(dc); DrawSash(dc); -#endif } // Set pane for unsplit window @@ -687,7 +731,7 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove) } else { - wxFAIL_MSG(_T("splitter: attempt to remove a non-existent window")); + wxFAIL_MSG(wxT("splitter: attempt to remove a non-existent window")); return FALSE; } @@ -702,8 +746,8 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove) // Replace a window with another one bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew) { - wxCHECK_MSG( winOld, FALSE, _T("use one of Split() functions instead") ); - wxCHECK_MSG( winNew, FALSE, _T("use Unsplit() functions instead") ); + wxCHECK_MSG( winOld, FALSE, wxT("use one of Split() functions instead") ); + wxCHECK_MSG( winNew, FALSE, wxT("use Unsplit() functions instead") ); if ( winOld == m_windowTwo ) { @@ -715,7 +759,7 @@ bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew) } else { - wxFAIL_MSG(_T("splitter: attempt to replace a non-existent window")); + wxFAIL_MSG(wxT("splitter: attempt to replace a non-existent window")); return FALSE; } @@ -845,8 +889,7 @@ void wxSplitterWindow::OnDoubleClick(wxSplitterEvent& event) // for compatibility, call the virtual function OnDoubleClickSash(event.GetX(), event.GetY()); - if ( GetMinimumPaneSize() == 0 - || m_permitUnsplitAlways) + if ( GetMinimumPaneSize() == 0 || m_permitUnsplitAlways ) { Unsplit(); } @@ -856,8 +899,9 @@ void wxSplitterWindow::OnUnsplitEvent(wxSplitterEvent& event) { wxWindow *win = event.GetWindowBeingRemoved(); + // do it before calling OnUnsplit() which may delete the window + win->Show(FALSE); + // for compatibility, call the virtual function OnUnsplit(win); - - win->Show(FALSE); }