X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04ee05f92add0ab92ce08ecb827e3be41336aa06..d2e66707deb10dea6f92e3e4092f8a43ef942a5d:/src/generic/splitter.cpp?ds=sidebyside diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index fd10afdde2..03abc8baa5 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -39,10 +39,10 @@ #include -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) +wxDEFINE_EVENT( wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, wxSplitterEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, wxSplitterEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, wxSplitterEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_SPLITTER_UNSPLIT, wxSplitterEvent ); IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow) @@ -61,15 +61,25 @@ BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow) EVT_PAINT(wxSplitterWindow::OnPaint) EVT_SIZE(wxSplitterWindow::OnSize) EVT_MOUSE_EVENTS(wxSplitterWindow::OnMouseEvent) + EVT_MOUSE_CAPTURE_LOST(wxSplitterWindow::OnMouseCaptureLost) #if defined( __WXMSW__ ) || defined( __WXMAC__) EVT_SET_CURSOR(wxSplitterWindow::OnSetCursor) #endif // wxMSW - - WX_EVENT_TABLE_CONTROL_CONTAINER(wxSplitterWindow) END_EVENT_TABLE() -WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow, wxWindow) +static bool IsLive(wxSplitterWindow* wnd) +{ + // 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 +#if defined( __WXMAC__ ) && defined(TARGET_API_MAC_OSX) && TARGET_API_MAC_OSX == 1 + return true; // Mac can't paint outside paint event - always need live mode +#else + return wnd->HasFlag(wxSP_LIVE_UPDATE); +#endif +} bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, @@ -80,10 +90,6 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id, // allow TABbing from one window to the other style |= wxTAB_TRAVERSAL; - // we draw our border ourselves to blend the sash with it - style &= ~wxBORDER_MASK; - style |= wxBORDER_NONE; - if ( !wxWindow::Create(parent, id, pos, size, style, name) ) return false; @@ -91,7 +97,7 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id, m_lastSize.x = size.x; if (size.y >= 0) m_lastSize.y = size.y; - + m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0; // FIXME: with this line the background is not erased at all under GTK1, @@ -107,20 +113,16 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id, void wxSplitterWindow::Init() { - WX_INIT_CONTROL_CONTAINER(); - m_splitMode = wxSPLIT_VERTICAL; m_permitUnsplitAlways = true; - m_windowOne = (wxWindow *) NULL; - m_windowTwo = (wxWindow *) NULL; + m_windowOne = NULL; + m_windowTwo = NULL; m_dragMode = wxSPLIT_DRAG_NONE; m_oldX = 0; m_oldY = 0; - m_firstX = 0; - m_firstY = 0; + m_sashStart = 0; m_sashPosition = m_requestedSashPosition = 0; m_sashGravity = 0.0; - m_sashSize = -1; // -1 means use the native sash size m_lastSize = wxSize(0,0); m_checkRequestedSashPosition = false; m_minimumPaneSize = 0; @@ -180,6 +182,12 @@ void wxSplitterWindow::SetResizeCursor() void wxSplitterWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc(this); +#ifdef __WXOSX__ + // as subpanels might have a transparent background we must erase the background + // at least on OSX, otherwise traces of the sash will remain + // test with: splitter sample->replace right window + dc.Clear(); +#endif DrawSash(dc); } @@ -206,20 +214,14 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) int x = (int)event.GetX(), y = (int)event.GetY(); - if (GetWindowStyle() & wxSP_NOSASH) + if ( GetWindowStyle() & wxSP_NOSASH ) + { + event.Skip(); return; + } + + bool isLive = IsLive(this); - // 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 -#if defined( __WXMAC__ ) - // FIXME : this should be usable also with no live update, but then this - // currently is not visible - bool isLive = true; -#else - bool isLive = HasFlag(wxSP_LIVE_UPDATE); -#endif if (event.LeftDown()) { if ( SashHitTest(x, y) ) @@ -237,13 +239,13 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) // shadow sash m_sashPositionCurrent = m_sashPosition; - DrawSashTracker(x, y); + m_oldX = (m_splitMode == wxSPLIT_VERTICAL ? m_sashPositionCurrent : x); + m_oldY = (m_splitMode != wxSPLIT_VERTICAL ? m_sashPositionCurrent : y); + DrawSashTracker(m_oldX, m_oldY); } - m_oldX = x; - m_oldY = y; - - SetResizeCursor(); + m_ptStart = wxPoint(x,y); + m_sashStart = m_sashPosition; return; } } @@ -271,10 +273,9 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) // 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; + int diff = m_splitMode == wxSPLIT_VERTICAL ? x - m_ptStart.x : y - m_ptStart.y; - int posSashOld = isLive ? m_sashPosition : m_sashPositionCurrent; - int posSashNew = OnSashPositionChanging(posSashOld + diff); + int posSashNew = OnSashPositionChanging(m_sashStart + diff); if ( posSashNew == -1 ) { // change not allowed @@ -289,7 +290,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) // We remove the first window from the view wxWindow *removedWindow = m_windowOne; m_windowOne = m_windowTwo; - m_windowTwo = (wxWindow *) NULL; + m_windowTwo = NULL; OnUnsplit(removedWindow); wxSplitterEvent eventUnsplit(wxEVT_COMMAND_SPLITTER_UNSPLIT, this); eventUnsplit.m_data.win = removedWindow; @@ -300,7 +301,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) { // We remove the second window from the view wxWindow *removedWindow = m_windowTwo; - m_windowTwo = (wxWindow *) NULL; + m_windowTwo = NULL; OnUnsplit(removedWindow); wxSplitterEvent eventUnsplit(wxEVT_COMMAND_SPLITTER_UNSPLIT, this); eventUnsplit.m_data.win = removedWindow; @@ -328,62 +329,53 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) } else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) { - int diff = m_splitMode == wxSPLIT_VERTICAL ? x - m_oldX : y - m_oldY; - if ( !diff ) - { - // nothing to do, mouse didn't really move far enough - return; - } + int diff = m_splitMode == wxSPLIT_VERTICAL ? x - m_ptStart.x : y - m_ptStart.y; - int posSashOld = isLive ? m_sashPosition : m_sashPositionCurrent; - int posSashNew = OnSashPositionChanging(posSashOld + diff); + int posSashNew = OnSashPositionChanging(m_sashStart + diff); if ( posSashNew == -1 ) { // change not allowed return; } - if ( posSashNew == m_sashPosition ) - return; - - // Erase old tracker if ( !isLive ) { - DrawSashTracker(m_oldX, m_oldY); - } + if ( posSashNew == m_sashPositionCurrent ) + return; - if (m_splitMode == wxSPLIT_VERTICAL) - x = posSashNew; - else - y = posSashNew; + m_sashPositionCurrent = posSashNew; - // Remember old positions - m_oldX = x; - m_oldY = y; + // Erase old tracker + DrawSashTracker(m_oldX, m_oldY); + + m_oldX = (m_splitMode == wxSPLIT_VERTICAL ? m_sashPositionCurrent : x); + m_oldY = (m_splitMode != wxSPLIT_VERTICAL ? m_sashPositionCurrent : y); #ifdef __WXMSW__ - // As we captured the mouse, we may get the mouse events from outside - // our window - for example, negative values in x, y. This has a weird - // consequence under MSW where we use unsigned values sometimes and - // signed ones other times: the coordinates turn as big positive - // numbers and so the sash is drawn on the *right* side of the window - // instead of the left (or bottom instead of top). Correct this. - if ( (short)m_oldX < 0 ) - m_oldX = 0; - if ( (short)m_oldY < 0 ) - m_oldY = 0; + // As we captured the mouse, we may get the mouse events from outside + // our window - for example, negative values in x, y. This has a weird + // consequence under MSW where we use unsigned values sometimes and + // signed ones other times: the coordinates turn as big positive + // numbers and so the sash is drawn on the *right* side of the window + // instead of the left (or bottom instead of top). Correct this. + if ( (short)m_oldX < 0 ) + m_oldX = 0; + if ( (short)m_oldY < 0 ) + m_oldY = 0; #endif // __WXMSW__ - // Draw new one - if ( !isLive ) - { - m_sashPositionCurrent = posSashNew; - + // Draw new one DrawSashTracker(m_oldX, m_oldY); } else { + if ( posSashNew == m_sashPosition ) + return; + DoSetSashPosition(posSashNew); + + // in live mode, the new position is the actual sash position, clear requested position! + m_requestedSashPosition = INT_MAX; m_needUpdating = true; } } @@ -391,6 +383,26 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) { OnDoubleClickSash(x, y); } + else + { + event.Skip(); + } +} + +void wxSplitterWindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) +{ + if (m_dragMode != wxSPLIT_DRAG_DRAGGING) + return; + + m_dragMode = wxSPLIT_DRAG_NONE; + + SetCursor(* wxSTANDARD_CURSOR); + + // Erase old tracker + if ( !IsLive(this) ) + { + DrawSashTracker(m_oldX, m_oldY); + } } void wxSplitterWindow::OnSize(wxSizeEvent& event) @@ -453,7 +465,7 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event) void wxSplitterWindow::SetSashGravity(double gravity) { wxCHECK_RET( gravity >= 0. && gravity <= 1., - _T("invalid gravity value") ); + wxT("invalid gravity value") ); m_sashGravity = gravity; } @@ -472,7 +484,7 @@ bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance) int wxSplitterWindow::GetSashSize() const { - return m_sashSize > -1 ? m_sashSize : wxRendererNative::Get().GetSplitterParams(this).widthSash; + return wxRendererNative::Get().GetSplitterParams(this).widthSash; } int wxSplitterWindow::GetBorderSize() const @@ -523,33 +535,15 @@ void wxSplitterWindow::DrawSashTracker(int x, int y) if ( m_splitMode == wxSPLIT_VERTICAL ) { - x1 = x; y1 = 2; - x2 = x; y2 = h-2; - - if ( x1 > w ) - { - x1 = w; x2 = w; - } - else if ( x1 < 0 ) - { - x1 = 0; x2 = 0; - } + x1 = x2 = wxClip(x, 0, w) + m_sashTrackerPen->GetWidth()/2; + y1 = 2; + y2 = h-2; } else { - x1 = 2; y1 = y; - x2 = w-2; y2 = y; - - if ( y1 > h ) - { - y1 = h; - y2 = h; - } - else if ( y1 < 0 ) - { - y1 = 0; - y2 = 0; - } + y1 = y2 = wxClip(y, 0, h) + m_sashTrackerPen->GetWidth()/2; + x1 = 2; + x2 = w-2; } ClientToScreen(&x1, &y1); @@ -602,7 +596,7 @@ int wxSplitterWindow::AdjustSashPosition(int sashPos) const minSize = m_minimumPaneSize; int maxSize = GetWindowSize() - minSize - GetBorderSize() - GetSashSize(); - if ( maxSize > 0 && sashPos > maxSize ) + if ( maxSize > 0 && sashPos > maxSize && maxSize >= m_minimumPaneSize) sashPos = maxSize; } @@ -719,14 +713,14 @@ void wxSplitterWindow::SizeWindows() // Set pane for unsplit window void wxSplitterWindow::Initialize(wxWindow *window) { - wxASSERT_MSG( (!window || (window && window->GetParent() == this)), - _T("windows in the splitter should have it as parent!") ); + wxASSERT_MSG( (!window || window->GetParent() == this), + wxT("windows in the splitter should have it as parent!") ); if (window && !window->IsShown()) window->Show(); m_windowOne = window; - m_windowTwo = (wxWindow *) NULL; + m_windowTwo = NULL; DoSetSashPosition(0); } @@ -741,10 +735,10 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode, return false; wxCHECK_MSG( window1 && window2, false, - _T("can not split with NULL window(s)") ); + wxT("cannot split with NULL window(s)") ); wxCHECK_MSG( window1->GetParent() == this && window2->GetParent() == this, false, - _T("windows in the splitter should have it as parent!") ); + wxT("windows in the splitter should have it as parent!") ); if (! window1->IsShown()) window1->Show(); @@ -755,15 +749,8 @@ bool wxSplitterWindow::DoSplit(wxSplitMode 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; - m_checkRequestedSashPosition = false; - - DoSetSashPosition(ConvertSashPosition(sashPosition)); - - SizeWindows(); + SetSashPosition(sashPosition, true); return true; } @@ -796,13 +783,13 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove) if ( toRemove == NULL || toRemove == m_windowTwo) { win = m_windowTwo ; - m_windowTwo = (wxWindow *) NULL; + m_windowTwo = NULL; } else if ( toRemove == m_windowOne ) { win = m_windowOne ; m_windowOne = m_windowTwo; - m_windowTwo = (wxWindow *) NULL; + m_windowTwo = NULL; } else { @@ -912,9 +899,12 @@ wxSize wxSplitterWindow::DoGetBestSize() const pSash = &sizeBest.y; } - // account for the border and the sash + // account for the sash if the window is actually split + if ( m_windowOne && m_windowTwo ) + *pSash += GetSashSize(); + + // account for the border too int border = 2*GetBorderSize(); - *pSash += GetSashSize(); sizeBest.x += border; sizeBest.y += border; @@ -968,12 +958,12 @@ int wxSplitterWindow::OnSashPositionChanging(int newSashPosition) { // If resultant pane would be too small, enlarge it newSashPosition = AdjustSashPosition(newSashPosition); - } - // If the result is out of bounds it means minimum size is too big, - // so split window in half as best compromise. - if ( newSashPosition < 0 || newSashPosition > window_size ) - newSashPosition = window_size / 2; + // If the result is out of bounds it means minimum size is too big, + // so split window in half as best compromise. + if ( newSashPosition < 0 || newSashPosition > window_size ) + newSashPosition = window_size / 2; + } // now let the event handler have it //