X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..be283c77a035cb8aa25c005677e11c5b5aae2975:/src/generic/splitter.cpp diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index c167c0f6f4..1573dd7a04 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -6,7 +6,7 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) @@ -36,6 +36,10 @@ #include "wx/settings.h" #endif +#ifdef __WXMAC__ + #include "wx/mac/private.h" +#endif + #include "wx/renderer.h" #include "wx/splitter.h" @@ -50,12 +54,12 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_UNSPLIT) IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow) /* - TODO PROPERTIES - style wxSP_3D - sashpos (long , 0 ) - minsize (long -1 ) - object, object_ref - orientation + TODO PROPERTIES + style wxSP_3D + sashpos (long , 0 ) + minsize (long -1 ) + object, object_ref + orientation */ IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxNotifyEvent) @@ -92,6 +96,14 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id, m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0; + // FIXME: with this line the background is not erased at all under GTK1, + // so temporary avoid it there +#if !defined(__WXGTK__) || defined(__WXGTK20__) + // don't erase the splitter background, it's pointless as we overwrite it + // anyhow + SetBackgroundStyle(wxBG_STYLE_CUSTOM); +#endif + return true; } @@ -109,6 +121,9 @@ void wxSplitterWindow::Init() m_firstX = 0; m_firstY = 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; m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE); @@ -183,7 +198,7 @@ void wxSplitterWindow::OnInternalIdle() SizeWindows(); return; // it won't needUpdating in this case } - + if (m_needUpdating) SizeWindows(); } @@ -200,15 +215,18 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) // 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__ ) && TARGET_API_MAC_OSX == 1 + bool isLive = true ; +#else bool isLive = (GetWindowStyleFlag() & wxSP_LIVE_UPDATE) != 0; - +#endif if (event.LeftDown()) { if ( SashHitTest(x, y) ) { // Start the drag now m_dragMode = wxSPLIT_DRAG_DRAGGING; - + // Capture mouse and set the cursor CaptureMouse(); SetResizeCursor(); @@ -233,7 +251,7 @@ 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); @@ -365,7 +383,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event) } else { - SetSashPositionAndNotify(posSashNew); + DoSetSashPosition(posSashNew); m_needUpdating = true; } } @@ -397,6 +415,8 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event) if ( iconized ) { + m_lastSize = wxSize(0,0); + event.Skip(); return; @@ -408,13 +428,36 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event) GetClientSize(&w, &h); int size = m_splitMode == wxSPLIT_VERTICAL ? w : h; + + int old_size = m_splitMode == wxSPLIT_VERTICAL ? m_lastSize.x : m_lastSize.y; + if ( old_size != 0 ) + { + int delta = (int) ( (size - old_size)*m_sashGravity ); + if ( delta != 0 ) + { + int newPosition = m_sashPosition + delta; + if( newPosition < m_minimumPaneSize ) + newPosition = m_minimumPaneSize; + SetSashPositionAndNotify(newPosition); + } + } + if ( m_sashPosition >= size - 5 ) SetSashPositionAndNotify(wxMax(10, size - 40)); + m_lastSize = wxSize(w,h); } SizeWindows(); } +void wxSplitterWindow::SetSashGravity(double gravity) +{ + wxCHECK_RET( gravity >= 0. && gravity <= 1., + _T("invalid gravity value") ); + + m_sashGravity = gravity; +} + bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance) { if ( m_windowTwo == NULL || m_sashPosition == 0) @@ -423,13 +466,13 @@ bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance) int z = m_splitMode == wxSPLIT_VERTICAL ? x : y; int hitMin = m_sashPosition - tolerance; int hitMax = m_sashPosition + GetSashSize() + tolerance; - + return z >= hitMin && z <= hitMax; } int wxSplitterWindow::GetSashSize() const { - return wxRendererNative::Get().GetSplitterParams(this).widthSash; + return m_sashSize > -1 ? m_sashSize : wxRendererNative::Get().GetSplitterParams(this).widthSash; } int wxSplitterWindow::GetBorderSize() const @@ -464,7 +507,7 @@ void wxSplitterWindow::DrawSash(wxDC& dc) m_sashPosition, m_splitMode == wxSPLIT_VERTICAL ? wxVERTICAL : wxHORIZONTAL, - m_isHot ? wxCONTROL_CURRENT : 0 + m_isHot ? (int)wxCONTROL_CURRENT : 0 ); } @@ -560,7 +603,7 @@ int wxSplitterWindow::AdjustSashPosition(int sashPos) const if ( minSize == -1 || m_minimumPaneSize > minSize ) minSize = m_minimumPaneSize; - int maxSize = window_size - minSize - GetBorderSize(); + int maxSize = window_size - minSize - GetBorderSize() - GetSashSize(); if ( sashPos > maxSize ) sashPos = maxSize; } @@ -582,13 +625,21 @@ bool wxSplitterWindow::DoSetSashPosition(int sashPos) void wxSplitterWindow::SetSashPositionAndNotify(int sashPos) { - if ( DoSetSashPosition(sashPos) ) - { - wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, this); - event.m_data.pos = m_sashPosition; + // we must reset the request here, otherwise the sash would be stuck at + // old position if the user attempted to move the sash after invalid + // (e.g. smaller than minsize) sash position was requested using + // SetSashPosition(): + m_requestedSashPosition = INT_MAX; - (void)DoSendEvent(event); - } + // note that we must send the event in any case, i.e. even if the sash + // position hasn't changed and DoSetSashPosition() returns false because we + // must generate a CHANGED event at the end of resizing + DoSetSashPosition(sashPos); + + wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, this); + event.m_data.pos = m_sashPosition; + + (void)DoSendEvent(event); } // Position and size subwindows. @@ -662,9 +713,12 @@ void wxSplitterWindow::SizeWindows() // Set pane for unsplit window void wxSplitterWindow::Initialize(wxWindow *window) { - wxASSERT_MSG( window && window->GetParent() == this, + wxASSERT_MSG( (!window || (window && window->GetParent() == this)), _T("windows in the splitter should have it as parent!") ); + if (window && !window->IsShown()) + window->Show(); + m_windowOne = window; m_windowTwo = (wxWindow *) NULL; DoSetSashPosition(0); @@ -686,6 +740,11 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode, wxCHECK_MSG( window1->GetParent() == this && window2->GetParent() == this, false, _T("windows in the splitter should have it as parent!") ); + if (! window1->IsShown()) + window1->Show(); + if (! window2->IsShown()) + window2->Show(); + m_splitMode = mode; m_windowOne = window1; m_windowTwo = window2; @@ -694,7 +753,7 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode, // right now (e.g. because the window is too small) m_requestedSashPosition = sashPosition; m_checkRequestedSashPosition = false; - + DoSetSashPosition(ConvertSashPosition(sashPosition)); SizeWindows(); @@ -792,7 +851,7 @@ void wxSplitterWindow::SetSashPosition(int position, bool redraw) // right now (e.g. because the window is too small) m_requestedSashPosition = position; m_checkRequestedSashPosition = false; - + DoSetSashPosition(ConvertSashPosition(position)); if ( redraw ) @@ -816,6 +875,46 @@ bool wxSplitterWindow::DoSendEvent(wxSplitterEvent& event) return !GetEventHandler()->ProcessEvent(event) || event.IsAllowed(); } +wxSize wxSplitterWindow::DoGetBestSize() const +{ + // get best sizes of subwindows + wxSize size1, size2; + if ( m_windowOne ) + size1 = m_windowOne->GetAdjustedBestSize(); + if ( m_windowTwo ) + size2 = m_windowTwo->GetAdjustedBestSize(); + + // sum them + // + // pSash points to the size component to which sash size must be added + int *pSash; + wxSize sizeBest; + if ( m_splitMode == wxSPLIT_VERTICAL ) + { + sizeBest.y = wxMax(size1.y, size2.y); + sizeBest.x = wxMax(size1.x, m_minimumPaneSize) + + wxMax(size2.x, m_minimumPaneSize); + + pSash = &sizeBest.x; + } + else // wxSPLIT_HORIZONTAL + { + sizeBest.x = wxMax(size1.x, size2.x); + sizeBest.y = wxMax(size1.y, m_minimumPaneSize) + + wxMax(size2.y, m_minimumPaneSize); + + pSash = &sizeBest.y; + } + + // account for the border and the sash + int border = 2*GetBorderSize(); + *pSash += GetSashSize(); + sizeBest.x += border; + sizeBest.y += border; + + return sizeBest; +} + // --------------------------------------------------------------------------- // wxSplitterWindow virtual functions: they now just generate the events // ---------------------------------------------------------------------------