// Author: Julian Smart
// Modified by:
// Created: 01/02/97
-// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "splitter.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#if wxUSE_SPLITTER
-
#ifdef __BORLANDC__
#pragma hdrstop
#endif
+#if wxUSE_SPLITTER
+
+#include "wx/splitter.h"
+
#ifndef WX_PRECOMP
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/log.h"
+ #include "wx/dcclient.h"
#include "wx/dcscreen.h"
#include "wx/window.h"
#include "wx/renderer.h"
-#include "wx/splitter.h"
-
#include <stdlib.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)
+wxDEFINE_EVENT( wxEVT_SPLITTER_SASH_POS_CHANGED, wxSplitterEvent );
+wxDEFINE_EVENT( wxEVT_SPLITTER_SASH_POS_CHANGING, wxSplitterEvent );
+wxDEFINE_EVENT( wxEVT_SPLITTER_DOUBLECLICKED, wxSplitterEvent );
+wxDEFINE_EVENT( wxEVT_SPLITTER_UNSPLIT, wxSplitterEvent );
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)
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);
+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,
// 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;
-
- // we don't need to be completely repainted after resize and doing it
- // results in horrible flicker
- style |= wxNO_FULL_REPAINT_ON_RESIZE;
-
if ( !wxWindow::Create(parent, id, pos, size, style, name) )
- return FALSE;
+ return false;
+
+ m_lastSize = GetClientSize();
m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0;
- return TRUE;
+ // 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;
}
void wxSplitterWindow::Init()
{
- m_container.SetContainerWindow(this);
-
m_splitMode = wxSPLIT_VERTICAL;
- m_permitUnsplitAlways = TRUE;
- m_windowOne = (wxWindow *) NULL;
- m_windowTwo = (wxWindow *) NULL;
+ m_permitUnsplitAlways = true;
+ m_windowOne = NULL;
+ m_windowTwo = NULL;
m_dragMode = wxSPLIT_DRAG_NONE;
m_oldX = 0;
m_oldY = 0;
- m_firstX = 0;
- m_firstY = 0;
- m_sashPosition = m_requestedSashPosition = 0;
+ m_sashStart = 0;
+ m_sashPosition = 0;
+ m_requestedSashPosition = INT_MAX;
+ m_sashGravity = 0.0;
+ m_lastSize = wxSize(0,0);
m_minimumPaneSize = 0;
m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE);
m_sashCursorNS = wxCursor(wxCURSOR_SIZENS);
- m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxSOLID);
+ m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxPENSTYLE_SOLID);
- m_needUpdating = FALSE;
+ m_needUpdating = false;
m_isHot = false;
}
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);
}
void wxSplitterWindow::OnInternalIdle()
{
wxWindow::OnInternalIdle();
-
- if (m_needUpdating)
- SizeWindows();
+
+ // We may need to update the children sizes in two cases: either because
+ // we're in the middle of a live update as indicated by m_needUpdating or
+ // because we have a requested but not yet set sash position as indicated
+ // by m_requestedSashPosition having a valid value.
+ if ( m_needUpdating )
+ {
+ m_needUpdating = false;
+ }
+ else if ( m_requestedSashPosition == INT_MAX )
+ {
+ // We don't need to resize the children.
+ return;
+ }
+
+ SizeWindows();
}
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;
+ }
- // 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;
+ bool isLive = IsLive(this);
if (event.LeftDown())
{
{
// Start the drag now
m_dragMode = wxSPLIT_DRAG_DRAGGING;
-
+
// Capture mouse and set the cursor
CaptureMouse();
SetResizeCursor();
// 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;
}
}
{
// 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);
// 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
// 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 event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
- event.m_data.win = removedWindow;
- (void)DoSendEvent(event);
+ wxSplitterEvent eventUnsplit(wxEVT_SPLITTER_UNSPLIT, this);
+ eventUnsplit.m_data.win = removedWindow;
+ (void)DoSendEvent(eventUnsplit);
SetSashPositionAndNotify(0);
}
else if ( posSashNew == GetWindowSize() )
{
// We remove the second window from the view
wxWindow *removedWindow = m_windowTwo;
- m_windowTwo = (wxWindow *) NULL;
+ m_windowTwo = NULL;
OnUnsplit(removedWindow);
- wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
- event.m_data.win = removedWindow;
- (void)DoSendEvent(event);
+ wxSplitterEvent eventUnsplit(wxEVT_SPLITTER_UNSPLIT, this);
+ eventUnsplit.m_data.win = removedWindow;
+ (void)DoSendEvent(eventUnsplit);
SetSashPositionAndNotify(0);
}
else
}
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;
+
+ // Erase old tracker
+ DrawSashTracker(m_oldX, m_oldY);
- // Remember old positions
- m_oldX = x;
- m_oldY = y;
+ 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
{
- SetSashPositionAndNotify(posSashNew);
- m_needUpdating = TRUE;
+ 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;
}
}
else if ( event.LeftDClick() && m_windowTwo )
{
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)
// 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() )
- {
- parent = parent->GetParent();
- }
-
- bool iconized = FALSE;
+ wxWindow *parent = wxGetTopLevelParent(this);
+ bool iconized;
wxTopLevelWindow *winTop = wxDynamicCast(parent, wxTopLevelWindow);
if ( winTop )
{
wxFAIL_MSG(wxT("should have a top level parent!"));
- iconized = FALSE;
+ iconized = false;
}
if ( iconized )
{
+ m_lastSize = wxSize(0,0);
+
event.Skip();
return;
}
- if ( m_windowTwo )
+ const wxSize curSize = event.GetSize();
+
+ // Update the sash position if needed.
+ //
+ // Notice that we shouldn't do this if the sash position requested by user
+ // couldn't be set yet as it would never be taken into account at all if we
+ // modified it before this happens.
+ if ( m_windowTwo && m_requestedSashPosition == INT_MAX )
{
- int w, h;
- GetClientSize(&w, &h);
+ int size = m_splitMode == wxSPLIT_VERTICAL ? curSize.x : curSize.y;
+
+ int old_size = m_splitMode == wxSPLIT_VERTICAL ? m_lastSize.x : m_lastSize.y;
+
+ // Don't do anything if the size didn't really change.
+ if ( size != old_size )
+ {
+ int newPosition = -1;
- int size = m_splitMode == wxSPLIT_VERTICAL ? w : h;
- if ( m_sashPosition >= size - 5 )
- SetSashPositionAndNotify(wxMax(10, size - 40));
+ // Apply gravity if we use it.
+ int delta = (int) ( (size - old_size)*m_sashGravity );
+ if ( delta != 0 )
+ {
+ newPosition = m_sashPosition + delta;
+ if( newPosition < m_minimumPaneSize )
+ newPosition = m_minimumPaneSize;
+ }
+
+ // Also check if the second window became too small.
+ newPosition = AdjustSashPosition(newPosition == -1
+ ? m_sashPosition
+ : newPosition);
+ if ( newPosition != m_sashPosition )
+ SetSashPositionAndNotify(newPosition);
+ }
}
+ m_lastSize = curSize;
+
SizeWindows();
}
-bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
+void wxSplitterWindow::SetSashGravity(double gravity)
+{
+ wxCHECK_RET( gravity >= 0. && gravity <= 1.,
+ wxT("invalid gravity value") );
+
+ m_sashGravity = gravity;
+}
+
+bool wxSplitterWindow::SashHitTest(int x, int y)
{
if ( m_windowTwo == NULL || m_sashPosition == 0)
- return FALSE; // No sash
+ return false; // No sash
int z = m_splitMode == wxSPLIT_VERTICAL ? x : y;
+ int hitMax = m_sashPosition + GetSashSize() - 1;
- return z >= m_sashPosition - tolerance &&
- z <= m_sashPosition + GetSashSize() + tolerance;
+ return z >= m_sashPosition && z <= hitMax;
+}
+
+void wxSplitterWindow::SetSashInvisible(bool invisible)
+{
+ if ( IsSashInvisible() != invisible )
+ ToggleWindowStyle(wxSP_NOSASH);
}
int wxSplitterWindow::GetSashSize() const
+{
+ return IsSashInvisible() ? 0 : GetDefaultSashSize();
+}
+
+int wxSplitterWindow::GetDefaultSashSize() const
{
return wxRendererNative::Get().GetSplitterParams(this).widthSash;
}
return;
// nor if we're configured to not show it
- if ( HasFlag(wxSP_NOSASH) )
+ if ( IsSashInvisible() )
return;
wxRendererNative::Get().DrawSplitterSash
m_sashPosition,
m_splitMode == wxSPLIT_VERTICAL ? wxVERTICAL
: wxHORIZONTAL,
- m_isHot ? wxCONTROL_CURRENT : 0
+ m_isHot ? (int)wxCONTROL_CURRENT : 0
);
}
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);
int wxSplitterWindow::AdjustSashPosition(int sashPos) const
{
- int window_size = GetWindowSize();
-
wxWindow *win;
win = GetWindow1();
if ( minSize == -1 || m_minimumPaneSize > minSize )
minSize = m_minimumPaneSize;
- int maxSize = window_size - minSize - GetBorderSize();
- if ( sashPos > maxSize )
+ int maxSize = GetWindowSize() - minSize - GetBorderSize() - GetSashSize();
+ if ( maxSize > 0 && sashPos > maxSize && maxSize >= m_minimumPaneSize)
sashPos = maxSize;
}
int newSashPosition = AdjustSashPosition(sashPos);
if ( newSashPosition == m_sashPosition )
- return FALSE;
+ return false;
m_sashPosition = newSashPosition;
- return TRUE;
+ 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;
+ // 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_SPLITTER_SASH_POS_CHANGED, this);
+ event.m_data.pos = m_sashPosition;
+
+ (void)DoSendEvent(event);
}
// Position and size subwindows.
{
w1 = size1;
w2 = w - 2*border - sash - w1;
- h1 =
+ if (w2 < 0)
+ w2 = 0;
h2 = h - 2*border;
+ if (h2 < 0)
+ h2 = 0;
+ h1 = h2;
x2 = size2;
y2 = border;
}
else // horz splitter
{
- w1 =
w2 = w - 2*border;
+ if (w2 < 0)
+ w2 = 0;
+ w1 = w2;
h1 = size1;
h2 = h - 2*border - sash - h1;
+ if (h2 < 0)
+ h2 = 0;
x2 = border;
y2 = size2;
}
- GetWindow1()->SetSize(border, border, w1, h1);
GetWindow2()->SetSize(x2, y2, w2, h2);
+ GetWindow1()->SetSize(border, border, w1, h1);
}
wxClientDC dc(this);
DrawSash(dc);
-
- SetNeedUpdating(FALSE);
}
// 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!") );
+ 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);
}
// 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.
+// Does nothing and returns false if the window is already split.
bool wxSplitterWindow::DoSplit(wxSplitMode mode,
wxWindow *window1, wxWindow *window2,
int sashPosition)
{
if ( IsSplit() )
- return FALSE;
+ return false;
+
+ wxCHECK_MSG( window1 && window2, false,
+ wxT("cannot split with NULL window(s)") );
- wxCHECK_MSG( window1 && window2, FALSE,
- _T("can not split with NULL window(s)") );
+ wxCHECK_MSG( window1->GetParent() == this && window2->GetParent() == this, false,
+ wxT("windows in the splitter should have it as parent!") );
- 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;
- // 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;
+ SetSashPosition(sashPosition, true);
+ return true;
}
int wxSplitterWindow::ConvertSashPosition(int sashPosition) const
bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
{
if ( ! IsSplit() )
- return FALSE;
+ return false;
- wxWindow *win = NULL;
+ wxWindow *win;
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
{
wxFAIL_MSG(wxT("splitter: attempt to remove a non-existent window"));
- return FALSE;
+ return false;
}
OnUnsplit(win);
DoSetSashPosition(0);
SizeWindows();
- return TRUE;
+ return true;
}
// Replace a window with another one
bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew)
{
- wxCHECK_MSG( winOld, FALSE, wxT("use one of Split() functions instead") );
- wxCHECK_MSG( winNew, FALSE, wxT("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 )
{
{
wxFAIL_MSG(wxT("splitter: attempt to replace a non-existent window"));
- return FALSE;
+ return false;
}
SizeWindows();
- return TRUE;
+ return true;
}
void wxSplitterWindow::SetMinimumPaneSize(int min)
{
m_minimumPaneSize = min;
- SetSashPosition(m_sashPosition); // re-check limits
+ int pos = m_requestedSashPosition != INT_MAX ? m_requestedSashPosition : m_sashPosition;
+ SetSashPosition(pos); // re-check limits
}
void wxSplitterWindow::SetSashPosition(int position, bool redraw)
{
- DoSetSashPosition(position);
+ // 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 = position;
+
+ DoSetSashPosition(ConvertSashPosition(position));
if ( redraw )
{
}
}
+// Make sure the child window sizes are updated. This is useful
+// for reducing flicker by updating the sizes before a
+// window is shown, if you know the overall size is correct.
+void wxSplitterWindow::UpdateSize()
+{
+ SizeWindows();
+}
+
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->GetEffectiveMinSize();
+ if ( m_windowTwo )
+ size2 = m_windowTwo->GetEffectiveMinSize();
+
+ // 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 sash if the window is actually split
+ if ( m_windowOne && m_windowTwo )
+ *pSash += GetSashSize();
+
+ // account for the border too
+ int border = 2*GetBorderSize();
+ sizeBest.x += border;
+ sizeBest.y += border;
+
+ return sizeBest;
+}
+
// ---------------------------------------------------------------------------
// wxSplitterWindow virtual functions: they now just generate the events
// ---------------------------------------------------------------------------
bool wxSplitterWindow::OnSashPositionChange(int WXUNUSED(newSashPosition))
{
// always allow by default
- return TRUE;
+ return true;
}
int wxSplitterWindow::OnSashPositionChanging(int newSashPosition)
// Obtain relevant window dimension for bottom / right threshold check
int window_size = GetWindowSize();
- bool unsplit_scenario = FALSE;
+ bool unsplit_scenario = false;
if ( m_permitUnsplitAlways || m_minimumPaneSize == 0 )
{
// Do edge detection if unsplit premitted
{
// threshold top / left check
newSashPosition = 0;
- unsplit_scenario = TRUE;
+ unsplit_scenario = true;
}
if ( newSashPosition >= window_size - UNSPLIT_THRESHOLD )
{
// threshold bottom/right check
newSashPosition = window_size;
- unsplit_scenario = TRUE;
+ unsplit_scenario = true;
}
}
{
// 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
//
// 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);
+ wxSplitterEvent event(wxEVT_SPLITTER_SASH_POS_CHANGING, this);
event.m_data.pos = newSashPosition;
if ( !DoSendEvent(event) )
wxCHECK_RET(m_windowTwo, wxT("splitter: no window to remove"));
// new code should handle events instead of using the virtual functions
- wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, this);
+ wxSplitterEvent event(wxEVT_SPLITTER_DOUBLECLICKED, this);
event.m_data.pt.x = x;
event.m_data.pt.y = y;
if ( DoSendEvent(event) )
wxWindow* win = m_windowTwo;
if ( Unsplit(win) )
{
- wxSplitterEvent unsplitEvent(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
+ wxSplitterEvent unsplitEvent(wxEVT_SPLITTER_UNSPLIT, this);
unsplitEvent.m_data.win = win;
(void)DoSendEvent(unsplitEvent);
}
void wxSplitterWindow::OnUnsplit(wxWindow *winRemoved)
{
// call this before calling the event handler which may delete the window
- winRemoved->Show(FALSE);
+ winRemoved->Show(false);
}
#if defined( __WXMSW__ ) || defined( __WXMAC__)
projects / wxWidgets.git / blobdiff