X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..c60ba92d097bd49e204f140f22ade84a1b6bc38c:/src/generic/splitter.cpp?ds=inline diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index 68a393a4a8..d958fa5e1a 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -33,6 +33,12 @@ #include "wx/dcscreen.h" #include "wx/settings.h" #include "wx/log.h" +#include "wx/utils.h" + +DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_UNSPLIT) IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxCommandEvent) @@ -51,14 +57,21 @@ BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow) EVT_SPLITTER_SASH_POS_CHANGING(-1, wxSplitterWindow::OnSashPosChanged) EVT_SPLITTER_DCLICK(-1, wxSplitterWindow::OnDoubleClick) EVT_SPLITTER_UNSPLIT(-1, wxSplitterWindow::OnUnsplitEvent) + + WX_EVENT_TABLE_CONTROL_CONTAINER(wxSplitterWindow) END_EVENT_TABLE() +WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow); + bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name) { + // allow TABbing from one window to the other + style |= wxTAB_TRAVERSAL; + if (!wxWindow::Create(parent, id, pos, size, style, name)) return FALSE; @@ -76,11 +89,20 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id, else m_borderSize = 0; +#ifdef __WXMAC__ + int major,minor; + wxGetOsVersion( &major, &minor ); + if (major >= 10) + m_windowStyle |= wxSP_SASH_AQUA; +#endif + return TRUE; } void wxSplitterWindow::Init() { + m_container.SetContainerWindow(this); + m_splitMode = wxSPLIT_VERTICAL; m_permitUnsplitAlways = TRUE; m_windowOne = (wxWindow *) NULL; @@ -134,16 +156,18 @@ void wxSplitterWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) DrawSash(dc); } -void wxSplitterWindow::OnIdle(wxIdleEvent& WXUNUSED(event)) +void wxSplitterWindow::OnIdle(wxIdleEvent& event) { if (m_needUpdating) SizeWindows(); + + event.Skip(); } void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) { - wxCoord x = (wxCoord)event.GetX(), - y = (wxCoord)event.GetY(); + int x = (int)event.GetX(), + y = (int)event.GetY(); // reset the cursor #ifdef __WXMOTIF__ @@ -197,11 +221,8 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) // Obtain window size. We are only interested in the dimension the sash // splits up - int w, h; - GetClientSize(&w, &h); - int window_size = (m_splitMode == wxSPLIT_VERTICAL ? w : h ); - int new_sash_position = - (int) ( m_splitMode == wxSPLIT_VERTICAL ? x : y ); + int window_size = GetWindowSize(); + int new_sash_position = m_splitMode == wxSPLIT_VERTICAL ? x : y; wxSplitterEvent eventSplitter(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, this); @@ -292,8 +313,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) // Obtain window size. We are only interested in the dimension the sash // splits up - int new_sash_position = - (int) ( m_splitMode == wxSPLIT_VERTICAL ? x : y ); + int new_sash_position = m_splitMode == wxSPLIT_VERTICAL ? x : y; wxSplitterEvent eventSplitter(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, this); @@ -307,7 +327,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) return; } } - + if (new_sash_position == m_sashPosition) return; @@ -373,42 +393,50 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event) } bool iconized = FALSE; - wxFrame *frame = wxDynamicCast(parent, wxFrame); - if ( frame ) - iconized = frame->IsIconized(); - else + + // wxMotif doesn't yet have a wxTopLevelWindow implementation +#ifdef __WXMOTIF__ + wxFrame *winTop = wxDynamicCast(parent, wxFrame); +#else + wxTopLevelWindow *winTop = wxDynamicCast(parent, wxTopLevelWindow); +#endif + if ( winTop ) { - wxDialog *dialog = wxDynamicCast(parent, wxDialog); - if ( dialog ) - iconized = dialog->IsIconized(); - else - wxFAIL_MSG(wxT("should have a top level frame or dialog parent!")); + iconized = winTop->IsIconized(); } +#ifndef __WXMOTIF__ + else + { + wxFAIL_MSG(wxT("should have a top level parent!")); + iconized = FALSE; + } +#endif + if ( iconized ) { event.Skip(); + + return; } - else + + int cw, ch; + GetClientSize( &cw, &ch ); + if ( m_windowTwo ) { - int cw, ch; - GetClientSize( &cw, &ch ); - if ( m_windowTwo ) + if ( m_splitMode == wxSPLIT_VERTICAL ) { - 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); - } + if ( m_sashPosition >= (cw - 5) ) + m_sashPosition = wxMax(10, cw - 40); + } + else // 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) @@ -492,7 +520,11 @@ void wxSplitterWindow::DrawSash(wxDC& dc) if ( m_splitMode == wxSPLIT_VERTICAL ) { dc.SetPen(*m_facePen); - dc.SetBrush(*m_faceBrush); + + if (HasFlag( wxSP_SASH_AQUA )) + dc.SetBrush(*wxWHITE_BRUSH); + else + dc.SetBrush(*m_faceBrush); dc.DrawRectangle(m_sashPosition + 2, 0 , m_sashSize - 4, h ); dc.SetBrush(*wxTRANSPARENT_BRUSH); @@ -504,11 +536,16 @@ void wxSplitterWindow::DrawSash(wxDC& dc) dc.SetPen(*m_hilightPen); dc.DrawLine(m_sashPosition+1, m_borderSize - 2, m_sashPosition+1, h - m_borderSize+2); - dc.SetPen(*m_mediumShadowPen); - int yMedium = m_borderSize ? h-m_borderSize+1 : h ; + if (!HasFlag( wxSP_SASH_AQUA )) + dc.SetPen(*m_mediumShadowPen); + + 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); + if (HasFlag( wxSP_SASH_AQUA )) + dc.SetPen(*m_lightShadowPen); + else + dc.SetPen(*m_darkShadowPen); dc.DrawLine(m_sashPosition+m_sashSize-1, m_borderSize, m_sashPosition+m_sashSize-1, h-m_borderSize ); // Draw the top and bottom edges of the sash, if requested @@ -526,7 +563,10 @@ void wxSplitterWindow::DrawSash(wxDC& dc) else { dc.SetPen(*m_facePen); - dc.SetBrush(*m_faceBrush); + if (HasFlag( wxSP_SASH_AQUA )) + dc.SetBrush(*wxWHITE_BRUSH); + else + dc.SetBrush(*m_faceBrush); dc.DrawRectangle( m_borderSize-2, m_sashPosition + 2, w-m_borderSize+2, m_sashSize - 4); dc.SetBrush(*wxTRANSPARENT_BRUSH); @@ -537,10 +577,14 @@ void wxSplitterWindow::DrawSash(wxDC& dc) dc.SetPen(*m_hilightPen); dc.DrawLine(m_borderSize-2, m_sashPosition+1, w-m_borderSize+1, m_sashPosition+1); - dc.SetPen(*m_mediumShadowPen); + if (!HasFlag( wxSP_SASH_AQUA )) + dc.SetPen(*m_mediumShadowPen); dc.DrawLine(m_borderSize-1, m_sashPosition+m_sashSize-2, w-m_borderSize+1, m_sashPosition+m_sashSize-2); - dc.SetPen(*m_darkShadowPen); + if (HasFlag( wxSP_SASH_AQUA )) + dc.SetPen(*m_lightShadowPen); + else + dc.SetPen(*m_darkShadowPen); dc.DrawLine(m_borderSize, m_sashPosition+m_sashSize-1, w-m_borderSize, m_sashPosition+m_sashSize-1); // Draw the left and right edges of the sash, if requested @@ -649,6 +693,63 @@ void wxSplitterWindow::DrawSashTracker(int x, int y) screenDC.SetBrush(wxNullBrush); } +int wxSplitterWindow::GetWindowSize() const +{ + wxSize size = GetClientSize(); + + return m_splitMode == wxSPLIT_VERTICAL ? size.x : size.y; +} + +int wxSplitterWindow::AdjustSashPosition(int sashPos) const +{ + int window_size = GetWindowSize(); + + // VZ: dirty fix, 20 is the initial window size under wxGTK, this is + // going to be replaced with the correct Vaclav's code soon (FIXME) + if ( window_size <= 20 ) + { + // don't do anything before the window has a valid size, otherwise we + // put the sash to 0 at the very beginning and it doesn't move from + // there any more + return sashPos; + } + + wxWindow *win; + + win = GetWindow1(); + if ( win ) + { + // the window shouldn't be smaller than its own minimal size nor + // smaller than the minimual pane size specified for this splitter + int minSize = m_splitMode == wxSPLIT_VERTICAL ? win->GetMinWidth() + : win->GetMinHeight(); + + if ( minSize == -1 || m_minimumPaneSize > minSize ) + minSize = m_minimumPaneSize; + + minSize += GetBorderSize(); + + if ( sashPos < minSize ) + sashPos = minSize; + } + + win = GetWindow2(); + if ( win ) + { + int minSize = m_splitMode == wxSPLIT_VERTICAL ? win->GetMinWidth() + : win->GetMinHeight(); + + if ( minSize == -1 || m_minimumPaneSize > minSize ) + minSize = m_minimumPaneSize; + + int maxSize = window_size - minSize - GetBorderSize(); + if ( sashPos > maxSize ) + sashPos = maxSize; + } + + return sashPos; +} + // Position and size subwindows. // Note that the border size applies to each subwindow, not // including the edges next to the sash. @@ -691,7 +792,7 @@ void wxSplitterWindow::SizeWindows() if ( GetBorderSize() > 0 ) DrawBorders(dc); DrawSash(dc); - + SetNeedUpdating(FALSE); } @@ -706,53 +807,47 @@ void wxSplitterWindow::Initialize(wxWindow *window) // Associates the given window with window 2, drawing the appropriate sash // and changing the split mode. // Does nothing and returns FALSE if the window is already split. -bool wxSplitterWindow::SplitVertically(wxWindow *window1, wxWindow *window2, int sashPosition) +bool wxSplitterWindow::DoSplit(wxSplitMode mode, + wxWindow *window1, wxWindow *window2, + int sashPosition) { if ( IsSplit() ) return FALSE; - int w, h; - GetClientSize(&w, &h); + int window_size = GetWindowSize(); - m_splitMode = wxSPLIT_VERTICAL; + m_splitMode = mode; m_windowOne = window1; m_windowTwo = window2; - if ( sashPosition > 0 ) - m_sashPosition = sashPosition; - else if ( sashPosition < 0 ) - m_sashPosition = w - sashPosition; - else // default - m_sashPosition = w/2; - SizeWindows(); - - return TRUE; -} - -bool wxSplitterWindow::SplitHorizontally(wxWindow *window1, wxWindow *window2, int sashPosition) -{ - if ( IsSplit() ) - return FALSE; - - int w, h; - GetClientSize(&w, &h); - - m_splitMode = wxSPLIT_HORIZONTAL; - m_windowOne = window1; - m_windowTwo = window2; if ( sashPosition > 0 ) + { m_sashPosition = sashPosition; + } else if ( sashPosition < 0 ) - m_sashPosition = h - sashPosition; - else // default - m_sashPosition = h/2; + { + // It's negative so adding is subtracting + m_sashPosition = window_size + sashPosition; + } + else + { + // default + m_sashPosition = window_size/2; + } + + // don't do it initially, i.e. when creating the window because it doesn't + // have a proper size yet and AdjustSashPosition() would happily set the + // sash position to 0! + if ( window_size > 0 ) + { + m_sashPosition = AdjustSashPosition(m_sashPosition); + } SizeWindows(); return TRUE; } - // Remove the specified (or second) window from the view // Doesn't actually delete the window. bool wxSplitterWindow::Unsplit(wxWindow *toRemove) @@ -814,7 +909,7 @@ bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew) void wxSplitterWindow::SetSashPosition(int position, bool redraw) { - m_sashPosition = position; + m_sashPosition = AdjustSashPosition(position); if ( redraw ) { @@ -833,30 +928,30 @@ void wxSplitterWindow::InitColours() wxDELETE( m_hilightPen ); // Shadow colours -#if defined(__WIN95__) - wxColour faceColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); +#ifndef __WIN16__ + wxColour faceColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); m_facePen = new wxPen(faceColour, 1, wxSOLID); m_faceBrush = new wxBrush(faceColour, wxSOLID); - wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW)); + wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)); m_mediumShadowPen = new wxPen(mediumShadowColour, 1, wxSOLID); - wxColour darkShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DDKSHADOW)); + wxColour darkShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW)); m_darkShadowPen = new wxPen(darkShadowColour, 1, wxSOLID); - wxColour lightShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT)); + wxColour lightShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT)); m_lightShadowPen = new wxPen(lightShadowColour, 1, wxSOLID); - wxColour hilightColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT)); + wxColour hilightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT)); m_hilightPen = new wxPen(hilightColour, 1, wxSOLID); -#else // !Win32 +#else m_facePen = new wxPen("LIGHT GREY", 1, wxSOLID); m_faceBrush = new wxBrush("LIGHT GREY", wxSOLID); m_mediumShadowPen = new wxPen("GREY", 1, wxSOLID); m_darkShadowPen = new wxPen("BLACK", 1, wxSOLID); m_lightShadowPen = new wxPen("LIGHT GREY", 1, wxSOLID); m_hilightPen = new wxPen("WHITE", 1, wxSOLID); -#endif // Win32/!Win32 +#endif // __WIN16__ } void wxSplitterWindow::SendUnsplitEvent(wxWindow *winRemoved) @@ -879,9 +974,7 @@ void wxSplitterWindow::OnSashPosChanged(wxSplitterEvent& event) int newSashPosition = event.GetSashPosition(); // Obtain relevant window dimension for bottom / right threshold check - int w, h; - GetClientSize(&w, &h); - int window_size = (m_splitMode == wxSPLIT_VERTICAL) ? w : h ; + int window_size = GetWindowSize(); bool unsplit_scenario = FALSE; if ( m_permitUnsplitAlways @@ -905,10 +998,7 @@ void wxSplitterWindow::OnSashPosChanged(wxSplitterEvent& event) if ( !unsplit_scenario ) { // If resultant pane would be too small, enlarge it - if ( newSashPosition < m_minimumPaneSize ) - newSashPosition = m_minimumPaneSize; - if ( newSashPosition > window_size - m_minimumPaneSize ) - newSashPosition = window_size - m_minimumPaneSize; + newSashPosition = AdjustSashPosition(newSashPosition); } // If the result is out of bounds it means minimum size is too big,