X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f80aa2dee1117406a72c11842977b6a4f94b5a14..003b8322f346ba005c07fff762dc3e90396a21a1:/src/generic/splitter.cpp diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index 88ff44a5ab..588657f137 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: splitter.cpp +// Name: src/generic/splitter.cpp // Purpose: wxSplitterWindow implementation // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -16,24 +16,32 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_SPLITTER + #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/utils.h" + #include "wx/log.h" + + #include "wx/dcscreen.h" + #include "wx/window.h" #include "wx/dialog.h" #include "wx/frame.h" + + #include "wx/settings.h" #endif -#include +#include "wx/dcmirror.h" +#include "wx/renderer.h" -#include "wx/string.h" #include "wx/splitter.h" -#include "wx/dcscreen.h" -#include "wx/settings.h" -#include "wx/log.h" -#include "wx/utils.h" + +#include DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED) DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING) @@ -41,22 +49,16 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED) DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_UNSPLIT) IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow) -IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxCommandEvent) +IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxNotifyEvent) BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow) EVT_PAINT(wxSplitterWindow::OnPaint) EVT_SIZE(wxSplitterWindow::OnSize) - EVT_IDLE(wxSplitterWindow::OnIdle) EVT_MOUSE_EVENTS(wxSplitterWindow::OnMouseEvent) +#if defined( __WXMSW__ ) || defined( __WXMAC__) EVT_SET_CURSOR(wxSplitterWindow::OnSetCursor) - - EVT_SPLITTER_SASH_POS_CHANGED(-1, wxSplitterWindow::OnSashPosChanged) - // NB: we borrow OnSashPosChanged for purposes of - // EVT_SPLITTER_SASH_POS_CHANGING since default implementation is identical - EVT_SPLITTER_SASH_POS_CHANGING(-1, wxSplitterWindow::OnSashPosChanged) - EVT_SPLITTER_DCLICK(-1, wxSplitterWindow::OnDoubleClick) - EVT_SPLITTER_UNSPLIT(-1, wxSplitterWindow::OnUnsplitEvent) +#endif // wxMSW WX_EVENT_TABLE_CONTROL_CONTAINER(wxSplitterWindow) END_EVENT_TABLE() @@ -72,29 +74,18 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id, // allow TABbing from one window to the other style |= wxTAB_TRAVERSAL; - if (!wxWindow::Create(parent, id, pos, size, style, name)) - return FALSE; + // we draw our border ourselves to blend the sash with it + style &= ~wxBORDER_MASK; + style |= wxBORDER_NONE; - m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0; + // we don't need to be completely repainted after resize and doing it + // results in horrible flicker + style |= wxNO_FULL_REPAINT_ON_RESIZE; - if ( style & wxSP_3DSASH ) - m_sashSize = 7; - else - m_sashSize = 3; - - if ( style & wxSP_3DBORDER ) - m_borderSize = 2; - else if ( style & wxSP_BORDER ) - m_borderSize = 1; - else - m_borderSize = 0; + if ( !wxWindow::Create(parent, id, pos, size, style, name) ) + return FALSE; -#ifdef __WXMAC__ - int major,minor; - wxGetOsVersion( &major, &minor ); - if (major >= 10) - m_windowStyle |= wxSP_SASH_AQUA; -#endif + m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0; return TRUE; } @@ -112,56 +103,39 @@ void wxSplitterWindow::Init() m_oldY = 0; m_firstX = 0; m_firstY = 0; - m_sashSize = 7; - m_borderSize = 2; - m_sashPosition = 0; + m_sashPosition = m_requestedSashPosition = 0; m_minimumPaneSize = 0; - m_sashCursorWE = new wxCursor(wxCURSOR_SIZEWE); - m_sashCursorNS = new wxCursor(wxCURSOR_SIZENS); + m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE); + m_sashCursorNS = wxCursor(wxCURSOR_SIZENS); m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxSOLID); - m_lightShadowPen = (wxPen *) NULL; - m_mediumShadowPen = (wxPen *) NULL; - m_darkShadowPen = (wxPen *) NULL; - m_faceBrush = (wxBrush *) NULL; - m_facePen = (wxPen *) NULL; - m_hilightPen = (wxPen *) NULL; - - m_borderSize = 0; - m_sashSize = 3; - - InitColours(); m_needUpdating = FALSE; } wxSplitterWindow::~wxSplitterWindow() { - delete m_sashCursorWE; - delete m_sashCursorNS; delete m_sashTrackerPen; - delete m_lightShadowPen; - delete m_darkShadowPen; - delete m_mediumShadowPen; - delete m_hilightPen; - delete m_facePen; - delete m_faceBrush; +} + +void wxSplitterWindow::SetResizeCursor() +{ + SetCursor(m_splitMode == wxSPLIT_VERTICAL ? m_sashCursorWE + : m_sashCursorNS); } void wxSplitterWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc(this); - if ( m_borderSize > 0 ) - DrawBorders(dc); DrawSash(dc); } -void wxSplitterWindow::OnIdle(wxIdleEvent& event) +void wxSplitterWindow::OnInternalIdle() { + wxWindow::OnInternalIdle(); + if (m_needUpdating) SizeWindows(); - - event.Skip(); } void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) @@ -169,41 +143,39 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) int x = (int)event.GetX(), y = (int)event.GetY(); - // reset the cursor -#ifdef __WXMOTIF__ - SetCursor(* wxSTANDARD_CURSOR); -#endif -#ifdef __WXMSW__ - SetCursor(wxCursor()); -#endif - if (GetWindowStyle() & wxSP_NOSASH) return; + // with wxSP_LIVE_UPDATE style the splitter windows are always resized + // following the mouse movement while it drags the sash, without it we only + // draw the sash at the new position but only resize the windows when the + // dragging is finished + bool isLive = (GetWindowStyleFlag() & wxSP_LIVE_UPDATE) != 0; + if (event.LeftDown()) { if ( SashHitTest(x, y) ) { - CaptureMouse(); - + // Start the drag now m_dragMode = wxSPLIT_DRAG_DRAGGING; + + // Capture mouse and set the cursor + CaptureMouse(); + SetResizeCursor(); - if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0) + if ( !isLive ) { + // remember the initial sash position and draw the initial + // shadow sash + m_sashPositionCurrent = m_sashPosition; + DrawSashTracker(x, y); } m_oldX = x; m_oldY = y; - if ( m_splitMode == wxSPLIT_VERTICAL ) - { - SetCursor(*m_sashCursorWE); - } - else - { - SetCursor(*m_sashCursorNS); - } + SetResizeCursor(); return; } } @@ -211,136 +183,116 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) { // We can stop dragging now and see what we've got. m_dragMode = wxSPLIT_DRAG_NONE; + + // Release mouse and unset the cursor ReleaseMouse(); + SetCursor(* wxSTANDARD_CURSOR); + + // exit if unsplit after doubleclick + if ( !IsSplit() ) + { + return; + } // Erase old tracker - if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0) + if ( !isLive ) { DrawSashTracker(m_oldX, m_oldY); } - // Obtain window size. We are only interested in the dimension the sash - // splits up - int window_size = GetWindowSize(); - int new_sash_position = m_splitMode == wxSPLIT_VERTICAL ? x : y; + // the position of the click doesn't exactly correspond to + // m_sashPosition, rather it changes it by the distance by which the + // mouse has moved + int diff = m_splitMode == wxSPLIT_VERTICAL ? x - m_oldX : y - m_oldY; - wxSplitterEvent eventSplitter(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, - this); - eventSplitter.m_data.pos = new_sash_position; - if ( GetEventHandler()->ProcessEvent(eventSplitter) ) + int posSashOld = isLive ? m_sashPosition : m_sashPositionCurrent; + int posSashNew = OnSashPositionChanging(posSashOld + diff); + if ( posSashNew == -1 ) { - new_sash_position = eventSplitter.GetSashPosition(); - if ( new_sash_position == -1 ) - { - // change not allowed - return; - } + // change not allowed + return; } if ( m_permitUnsplitAlways || m_minimumPaneSize == 0 ) { // Deal with possible unsplit scenarios - if ( new_sash_position == 0 ) + if ( posSashNew == 0 ) { // We remove the first window from the view wxWindow *removedWindow = m_windowOne; m_windowOne = m_windowTwo; m_windowTwo = (wxWindow *) NULL; - SendUnsplitEvent(removedWindow); - m_sashPosition = 0; + OnUnsplit(removedWindow); + wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this); + event.m_data.win = removedWindow; + (void)DoSendEvent(event); + SetSashPositionAndNotify(0); } - else if ( new_sash_position == window_size ) + else if ( posSashNew == GetWindowSize() ) { // We remove the second window from the view wxWindow *removedWindow = m_windowTwo; m_windowTwo = (wxWindow *) NULL; - SendUnsplitEvent(removedWindow); - m_sashPosition = 0; + OnUnsplit(removedWindow); + wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this); + event.m_data.win = removedWindow; + (void)DoSendEvent(event); + SetSashPositionAndNotify(0); } else { - m_sashPosition = new_sash_position; + SetSashPositionAndNotify(posSashNew); } } else { - m_sashPosition = new_sash_position; + SetSashPositionAndNotify(posSashNew); } SizeWindows(); } // left up && dragging - else if (event.Moving() && !event.Dragging()) + else if ((event.Moving() || event.Leaving() || event.Entering()) && (m_dragMode == wxSPLIT_DRAG_NONE)) { - // Just change the cursor if required - if ( SashHitTest(x, y) ) + // Just change the cursor as required + if ( !event.Leaving() && SashHitTest(x, y) ) { - if ( m_splitMode == wxSPLIT_VERTICAL ) - { - SetCursor(*m_sashCursorWE); - } - else - { - SetCursor(*m_sashCursorNS); - } + SetResizeCursor(); } -#if defined(__WXGTK__) || defined(__WXMSW__) else { - // We must set the normal cursor in MSW, because - // if the child window doesn't have a cursor, the - // parent's (splitter window) will be used, and this - // must be the standard cursor. - - // where else do we unset the cursor? SetCursor(* wxSTANDARD_CURSOR); } -#endif // __WXGTK__ } else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) { -#ifdef __WXMSW__ - // Otherwise, the cursor sometimes reverts to the normal cursor - // during dragging. - if ( m_splitMode == wxSPLIT_VERTICAL ) + int diff = m_splitMode == wxSPLIT_VERTICAL ? x - m_oldX : y - m_oldY; + if ( !diff ) { - SetCursor(*m_sashCursorWE); - } - else - { - SetCursor(*m_sashCursorNS); + // nothing to do, mouse didn't really move far enough + return; } -#endif - // Obtain window size. We are only interested in the dimension the sash - // splits up - int new_sash_position = m_splitMode == wxSPLIT_VERTICAL ? x : y; - - wxSplitterEvent eventSplitter(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, - this); - eventSplitter.m_data.pos = new_sash_position; - if ( GetEventHandler()->ProcessEvent(eventSplitter) ) + int posSashOld = isLive ? m_sashPosition : m_sashPositionCurrent; + int posSashNew = OnSashPositionChanging(posSashOld + diff); + if ( posSashNew == -1 ) { - new_sash_position = eventSplitter.GetSashPosition(); - if ( new_sash_position == -1 ) - { - // change not allowed - return; - } + // change not allowed + return; } - if (new_sash_position == m_sashPosition) + if ( posSashNew == m_sashPosition ) return; // Erase old tracker - if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0) + if ( !isLive ) { DrawSashTracker(m_oldX, m_oldY); } if (m_splitMode == wxSPLIT_VERTICAL) - x = new_sash_position; + x = posSashNew; else - y = new_sash_position; + y = posSashNew; // Remember old positions m_oldX = x; @@ -360,24 +312,21 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) #endif // __WXMSW__ // Draw new one - if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0) + if ( !isLive ) { + m_sashPositionCurrent = posSashNew; + DrawSashTracker(m_oldX, m_oldY); } else { - m_sashPosition = new_sash_position; + SetSashPositionAndNotify(posSashNew); m_needUpdating = TRUE; } } - else if ( event.LeftDClick() ) + else if ( event.LeftDClick() && m_windowTwo ) { - wxSplitterEvent eventSplitter(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, - this); - eventSplitter.m_data.pt.x = x; - eventSplitter.m_data.pt.y = y; - - (void)GetEventHandler()->ProcessEvent(eventSplitter); + OnDoubleClickSash(x, y); } } @@ -392,7 +341,7 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event) parent = parent->GetParent(); } - bool iconized; + bool iconized = FALSE; wxTopLevelWindow *winTop = wxDynamicCast(parent, wxTopLevelWindow); if ( winTop ) @@ -413,20 +362,14 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event) return; } - 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); - } - else // m_splitMode == wxSPLIT_HORIZONTAL - { - if ( m_sashPosition >= (ch - 5) ) - m_sashPosition = wxMax(10, ch - 40); - } + int w, h; + GetClientSize(&w, &h); + + int size = m_splitMode == wxSPLIT_VERTICAL ? w : h; + if ( m_sashPosition >= size - 5 ) + SetSashPositionAndNotify(wxMax(10, size - 40)); } SizeWindows(); @@ -437,197 +380,47 @@ bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance) if ( m_windowTwo == NULL || m_sashPosition == 0) return FALSE; // No sash - if ( m_splitMode == wxSPLIT_VERTICAL ) - { - if ( (x >= m_sashPosition - tolerance) && (x <= m_sashPosition + m_sashSize + tolerance) ) - return TRUE; - else - return FALSE; - } - else - { - if ( (y >= (m_sashPosition- tolerance)) && (y <= (m_sashPosition + m_sashSize + tolerance)) ) - return TRUE; - else - return FALSE; - } + int z = m_splitMode == wxSPLIT_VERTICAL ? x : y; + + return z >= m_sashPosition - tolerance && z <= m_sashPosition + tolerance; } -// Draw 3D effect borders -void wxSplitterWindow::DrawBorders(wxDC& dc) +int wxSplitterWindow::GetSashSize() const { - int w, h; - GetClientSize(&w, &h); - - if ( GetWindowStyleFlag() & wxSP_3DBORDER ) - { - - 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(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(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(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-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 ) - { - dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.SetPen(*wxBLACK_PEN); - dc.DrawRectangle(0, 0, w-1, h-1); - } + return wxRendererNative::Get().GetSplitterSashAndBorder(this).x; +} - dc.SetPen(wxNullPen); - dc.SetBrush(wxNullBrush); +int wxSplitterWindow::GetBorderSize() const +{ + return wxRendererNative::Get().GetSplitterSashAndBorder(this).y; } // Draw the sash void wxSplitterWindow::DrawSash(wxDC& dc) { - if ( m_sashPosition == 0 || !m_windowTwo) + wxRendererNative::Get().DrawSplitterBorder + ( + this, + dc, + GetClientRect() + ); + + // don't draw sash if we're not split + if ( m_sashPosition == 0 || !m_windowTwo ) return; - if (GetWindowStyle() & wxSP_NOSASH) - return; - - int w, h; - GetClientSize(&w, &h); - - if ( GetWindowStyleFlag() & wxSP_3DSASH ) - { - if ( m_splitMode == wxSPLIT_VERTICAL ) - { - dc.SetPen(*m_facePen); - - 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); - - dc.SetPen(*m_lightShadowPen); - 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, m_borderSize - 2, m_sashPosition+1, h - m_borderSize+2); - - 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); - - 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 - if (GetWindowStyle() & wxSP_FULLSASH) - { - // Top - dc.SetPen(*m_hilightPen); - dc.DrawLine(m_sashPosition+1, m_borderSize, m_sashPosition+m_sashSize-1, m_borderSize); - - // Bottom - dc.SetPen(*m_darkShadowPen); - dc.DrawLine(m_sashPosition+1, h-m_borderSize-1, m_sashPosition+m_sashSize-1, h-m_borderSize-1); - } - } - else - { - dc.SetPen(*m_facePen); - 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); - - dc.SetPen(*m_lightShadowPen); - dc.DrawLine(m_borderSize-1, m_sashPosition, w-m_borderSize, m_sashPosition); - dc.SetPen(*m_hilightPen); - dc.DrawLine(m_borderSize-2, m_sashPosition+1, w-m_borderSize+1, m_sashPosition+1); - - 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); - - 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 - if (GetWindowStyle() & wxSP_FULLSASH) - { - // Left - dc.SetPen(*m_hilightPen); - dc.DrawLine(m_borderSize, m_sashPosition, m_borderSize, m_sashPosition+m_sashSize); - - // Right - dc.SetPen(*m_darkShadowPen); - dc.DrawLine(w-m_borderSize-1, m_sashPosition+1, w-m_borderSize-1, m_sashPosition+m_sashSize-1); - } - } - } - else - { - if ( m_splitMode == wxSPLIT_VERTICAL ) - { - dc.SetPen(*wxBLACK_PEN); - dc.SetBrush(*wxBLACK_BRUSH); - int h1 = h-1; - int y1 = 0; - if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER ) - h1 += 1; // Not sure why this is necessary... - if ( (GetWindowStyleFlag() & wxSP_3DBORDER) == wxSP_3DBORDER) - { - y1 = 2; h1 -= 3; - } - dc.DrawRectangle(m_sashPosition, y1, m_sashSize, h1); - } - else - { - dc.SetPen(*wxBLACK_PEN); - dc.SetBrush(*wxBLACK_BRUSH); - int w1 = w-1; - int x1 = 0; - if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER ) - w1 ++; - if ( (GetWindowStyleFlag() & wxSP_3DBORDER) == wxSP_3DBORDER) - { - x1 = 2; w1 -= 3; - } - dc.DrawRectangle(x1, m_sashPosition, w1, m_sashSize); - } - - } + // nor if we're configured to not show it + if ( HasFlag(wxSP_NOSASH) ) + return; - dc.SetPen(wxNullPen); - dc.SetBrush(wxNullBrush); + wxMirrorDC dcMirror(dc, m_splitMode != wxSPLIT_VERTICAL); + wxRendererNative::Get().DrawSplitterSash + ( + this, + dcMirror, + dcMirror.Reflect(GetClientSize()), + m_sashPosition + ); } // Draw the sash tracker (for whilst moving the sash) @@ -681,9 +474,6 @@ void wxSplitterWindow::DrawSashTracker(int x, int y) screenDC.DrawLine(x1, y1, x2, y2); screenDC.SetLogicalFunction(wxCOPY); - - screenDC.SetPen(wxNullPen); - screenDC.SetBrush(wxNullBrush); } int wxSplitterWindow::GetWindowSize() const @@ -697,16 +487,6 @@ 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(); @@ -743,47 +523,92 @@ int wxSplitterWindow::AdjustSashPosition(int sashPos) const return sashPos; } +bool wxSplitterWindow::DoSetSashPosition(int sashPos) +{ + int newSashPosition = AdjustSashPosition(sashPos); + + if ( newSashPosition == m_sashPosition ) + return FALSE; + + m_sashPosition = newSashPosition; + + return TRUE; +} + +void wxSplitterWindow::SetSashPositionAndNotify(int sashPos) +{ + if ( DoSetSashPosition(sashPos) ) + { + wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, this); + event.m_data.pos = m_sashPosition; + + (void)DoSendEvent(event); + } +} + // Position and size subwindows. // Note that the border size applies to each subwindow, not // including the edges next to the sash. void wxSplitterWindow::SizeWindows() { + // check if we have delayed setting the real sash position + if ( m_requestedSashPosition != INT_MAX ) + { + int newSashPosition = ConvertSashPosition(m_requestedSashPosition); + if ( newSashPosition != m_sashPosition ) + { + DoSetSashPosition(newSashPosition); + } + + if ( newSashPosition <= m_sashPosition + && newSashPosition >= m_sashPosition - GetBorderSize() ) + { + // don't update it any more + m_requestedSashPosition = INT_MAX; + } + } + int w, h; GetClientSize(&w, &h); if ( GetWindow1() && !GetWindow2() ) { - GetWindow1()->SetSize(GetBorderSize(), GetBorderSize(), w - 2*GetBorderSize(), h - 2*GetBorderSize()); - + GetWindow1()->SetSize(GetBorderSize(), GetBorderSize(), + w - 2*GetBorderSize(), h - 2*GetBorderSize()); } else if ( GetWindow1() && GetWindow2() ) { - if (GetSplitMode() == wxSPLIT_VERTICAL) + const int border = GetBorderSize(), + sash = GetSashSize(); + + int size1 = GetSashPosition() - border, + size2 = GetSashPosition() + sash; + + int x2, y2, w1, h1, w2, h2; + if ( GetSplitMode() == wxSPLIT_VERTICAL ) { - int x1 = GetBorderSize(); - int y1 = GetBorderSize(); - int w1 = GetSashPosition() - GetBorderSize(); - int h1 = h - 2*GetBorderSize(); - - int x2 = GetSashPosition() + GetSashSize(); - int y2 = GetBorderSize(); - int w2 = w - 2*GetBorderSize() - GetSashSize() - w1; - int h2 = h - 2*GetBorderSize(); - - GetWindow1()->SetSize(x1, y1, w1, h1); - GetWindow2()->SetSize(x2, y2, w2, h2); + w1 = size1; + w2 = w - 2*border - sash - w1; + h1 = + h2 = h - 2*border; + x2 = size2; + y2 = border; } - else + else // horz splitter { - GetWindow1()->SetSize(GetBorderSize(), GetBorderSize(), - w - 2*GetBorderSize(), GetSashPosition() - GetBorderSize()); - GetWindow2()->SetSize(GetBorderSize(), GetSashPosition() + GetSashSize(), - w - 2*GetBorderSize(), h - 2*GetBorderSize() - GetSashSize() - (GetSashPosition() - GetBorderSize())); + w1 = + w2 = w - 2*border; + h1 = size1; + h2 = h - 2*border - sash - h1; + x2 = border; + y2 = size2; } + + GetWindow1()->SetSize(border, border, w1, h1); + GetWindow2()->SetSize(x2, y2, w2, h2); } + wxClientDC dc(this); - if ( GetBorderSize() > 0 ) - DrawBorders(dc); DrawSash(dc); SetNeedUpdating(FALSE); @@ -792,9 +617,12 @@ void wxSplitterWindow::SizeWindows() // Set pane for unsplit window void wxSplitterWindow::Initialize(wxWindow *window) { + wxASSERT_MSG( window && window->GetParent() == this, + _T("windows in the splitter should have it as parent!") ); + m_windowOne = window; m_windowTwo = (wxWindow *) NULL; - m_sashPosition = 0; + DoSetSashPosition(0); } // Associates the given window with window 2, drawing the appropriate sash @@ -807,38 +635,43 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode, if ( IsSplit() ) return FALSE; - int window_size = GetWindowSize(); + wxCHECK_MSG( window1 && window2, FALSE, + _T("can not split with NULL window(s)") ); + + wxCHECK_MSG( window1->GetParent() == this && window2->GetParent() == this, FALSE, + _T("windows in the splitter should have it as parent!") ); m_splitMode = mode; m_windowOne = window1; m_windowTwo = window2; + // remember the sash position we want to set for later if we can't set it + // right now (e.g. because the window is too small) + m_requestedSashPosition = sashPosition; + + DoSetSashPosition(ConvertSashPosition(sashPosition)); + + SizeWindows(); + + return TRUE; +} + +int wxSplitterWindow::ConvertSashPosition(int sashPosition) const +{ if ( sashPosition > 0 ) { - m_sashPosition = sashPosition; + return sashPosition; } else if ( sashPosition < 0 ) { // It's negative so adding is subtracting - m_sashPosition = window_size + sashPosition; + return GetWindowSize() + sashPosition; } - else + else // sashPosition == 0 { - // default - m_sashPosition = window_size/2; + // default, put it in the centre + return GetWindowSize() / 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 @@ -867,8 +700,8 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove) return FALSE; } - SendUnsplitEvent(win); - m_sashPosition = 0; + OnUnsplit(win); + DoSetSashPosition(0); SizeWindows(); return TRUE; @@ -900,9 +733,15 @@ bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew) return TRUE; } +void wxSplitterWindow::SetMinimumPaneSize(int min) +{ + m_minimumPaneSize = min; + SetSashPosition(m_sashPosition); // re-check limits +} + void wxSplitterWindow::SetSashPosition(int position, bool redraw) { - m_sashPosition = AdjustSashPosition(position); + DoSetSashPosition(position); if ( redraw ) { @@ -910,68 +749,38 @@ void wxSplitterWindow::SetSashPosition(int position, bool redraw) } } -// Initialize colours -void wxSplitterWindow::InitColours() -{ - wxDELETE( m_facePen ); - wxDELETE( m_faceBrush ); - wxDELETE( m_mediumShadowPen ); - wxDELETE( m_darkShadowPen ); - wxDELETE( m_lightShadowPen ); - wxDELETE( m_hilightPen ); - - // Shadow colours -#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::GetColour(wxSYS_COLOUR_3DSHADOW)); - m_mediumShadowPen = new wxPen(mediumShadowColour, 1, wxSOLID); - - wxColour darkShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW)); - m_darkShadowPen = new wxPen(darkShadowColour, 1, wxSOLID); - - wxColour lightShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT)); - m_lightShadowPen = new wxPen(lightShadowColour, 1, wxSOLID); - - wxColour hilightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT)); - m_hilightPen = new wxPen(hilightColour, 1, wxSOLID); -#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 // __WIN16__ -} - -void wxSplitterWindow::SendUnsplitEvent(wxWindow *winRemoved) +bool wxSplitterWindow::DoSendEvent(wxSplitterEvent& event) { - wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this); - event.m_data.win = winRemoved; - - (void)GetEventHandler()->ProcessEvent(event); + return !GetEventHandler()->ProcessEvent(event) || event.IsAllowed(); } // --------------------------------------------------------------------------- -// splitter event handlers +// wxSplitterWindow virtual functions: they now just generate the events // --------------------------------------------------------------------------- -void wxSplitterWindow::OnSashPosChanged(wxSplitterEvent& event) +bool wxSplitterWindow::OnSashPositionChange(int WXUNUSED(newSashPosition)) +{ + // always allow by default + return TRUE; +} + +int wxSplitterWindow::OnSashPositionChanging(int newSashPosition) { // If within UNSPLIT_THRESHOLD from edge, set to edge to cause closure. const int UNSPLIT_THRESHOLD = 4; - int newSashPosition = event.GetSashPosition(); + // first of all, check if OnSashPositionChange() doesn't forbid this change + if ( !OnSashPositionChange(newSashPosition) ) + { + // it does + return -1; + } // Obtain relevant window dimension for bottom / right threshold check int window_size = GetWindowSize(); bool unsplit_scenario = FALSE; - if ( m_permitUnsplitAlways - || m_minimumPaneSize == 0 ) + if ( m_permitUnsplitAlways || m_minimumPaneSize == 0 ) { // Do edge detection if unsplit premitted if ( newSashPosition <= UNSPLIT_THRESHOLD ) @@ -999,50 +808,64 @@ void wxSplitterWindow::OnSashPosChanged(wxSplitterEvent& event) if ( newSashPosition < 0 || newSashPosition > window_size ) newSashPosition = window_size / 2; - // for compatibility, call the virtual function - if ( !OnSashPositionChange(newSashPosition) ) + // now let the event handler have it + // + // FIXME: shouldn't we do it before the adjustments above so as to ensure + // that the sash position is always reasonable? + wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, this); + event.m_data.pos = newSashPosition; + + if ( !DoSendEvent(event) ) { + // the event handler vetoed the change newSashPosition = -1; } + else + { + // it could have been changed by it + newSashPosition = event.GetSashPosition(); + } - event.SetSashPosition(newSashPosition); + return newSashPosition; } // Called when the sash is double-clicked. The default behaviour is to remove // the sash if the minimum pane size is zero. -void wxSplitterWindow::OnDoubleClick(wxSplitterEvent& event) +void wxSplitterWindow::OnDoubleClickSash(int x, int y) { - // for compatibility, call the virtual function - OnDoubleClickSash(event.GetX(), event.GetY()); + wxCHECK_RET(m_windowTwo, wxT("splitter: no window to remove")); - if ( GetMinimumPaneSize() == 0 || m_permitUnsplitAlways ) + // new code should handle events instead of using the virtual functions + wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, this); + event.m_data.pt.x = x; + event.m_data.pt.y = y; + if ( DoSendEvent(event) ) { - Unsplit(); + if ( GetMinimumPaneSize() == 0 || m_permitUnsplitAlways ) + { + wxWindow* win = m_windowTwo; + if ( Unsplit(win) ) + { + wxSplitterEvent unsplitEvent(wxEVT_COMMAND_SPLITTER_UNSPLIT, this); + unsplitEvent.m_data.win = win; + (void)DoSendEvent(unsplitEvent); + } + } } + //else: blocked by user } -void wxSplitterWindow::OnUnsplitEvent(wxSplitterEvent& event) +void wxSplitterWindow::OnUnsplit(wxWindow *winRemoved) { - 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); + // call this before calling the event handler which may delete the window + winRemoved->Show(FALSE); } -#if defined(__WXMSW__) - #define WXUNUSED_UNLESS_MSW(identifier) identifier -#else - #define WXUNUSED_UNLESS_MSW(identifier) WXUNUSED(identifier) -#endif +#if defined( __WXMSW__ ) || defined( __WXMAC__) -void wxSplitterWindow::OnSetCursor(wxSetCursorEvent& WXUNUSED_UNLESS_MSW(event)) +// this is currently called (and needed) under MSW only... +void wxSplitterWindow::OnSetCursor(wxSetCursorEvent& event) { - // this is currently called (and needed) under MSW only... -#ifdef __WXMSW__ - // if we don't do it, the resizing cursor might be set for child window: // and like this we explicitly say that our cursor should not be used for // children windows which overlap us @@ -1053,5 +876,9 @@ void wxSplitterWindow::OnSetCursor(wxSetCursorEvent& WXUNUSED_UNLESS_MSW(event)) event.Skip(); } //else: do nothing, in particular, don't call Skip() -#endif // wxMSW } + +#endif // wxMSW || wxMac + +#endif // wxUSE_SPLITTER +