/////////////////////////////////////////////////////////////////////////////
-// 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__
- #pragma implementation "splitter.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#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/dialog.h"
#include "wx/frame.h"
+
+ #include "wx/settings.h"
#endif
-#include <stdlib.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 <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_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)
-IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxCommandEvent)
+
+/*
+ TODO PROPERTIES
+ style wxSP_3D
+ sashpos (long , 0 )
+ minsize (long -1 )
+ object, object_ref
+ orientation
+*/
+
+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()
-WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow);
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow, wxWindow)
bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
// 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;
+#ifdef __WXMAC__
+ // CoreGraphics can't paint sash feedback
+ style |= wxSP_LIVE_UPDATE;
+#endif
- if ( style & wxSP_3DSASH )
- m_sashSize = 7;
- else
- m_sashSize = 3;
+ if ( !wxWindow::Create(parent, id, pos, size, style, name) )
+ return false;
- if ( style & wxSP_3DBORDER )
- m_borderSize = 2;
- else if ( style & wxSP_BORDER )
- m_borderSize = 1;
- else
- m_borderSize = 0;
+ if (size.x >= 0)
+ m_lastSize.x = size.x;
+ if (size.y >= 0)
+ m_lastSize.y = size.y;
- return TRUE;
+ 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;
}
void wxSplitterWindow::Init()
{
- m_container.SetContainerWindow(this);
+ WX_INIT_CONTROL_CONTAINER();
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_sashSize = 7;
- m_borderSize = 2;
- m_sashPosition = 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 = new wxCursor(wxCURSOR_SIZEWE);
- m_sashCursorNS = new 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_sashCursorWE = wxCursor(wxCURSOR_SIZEWE);
+ m_sashCursorNS = wxCursor(wxCURSOR_SIZENS);
+ m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxPENSTYLE_SOLID);
- m_needUpdating = FALSE;
+ m_needUpdating = false;
+ m_isHot = 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;
}
+// ----------------------------------------------------------------------------
+// entering/leaving sash
+// ----------------------------------------------------------------------------
+
+void wxSplitterWindow::RedrawIfHotSensitive(bool isHot)
+{
+ if ( wxRendererNative::Get().GetSplitterParams(this).isHotSensitive )
+ {
+ m_isHot = isHot;
+
+ wxClientDC dc(this);
+ DrawSash(dc);
+ }
+ //else: we don't change our appearance, don't redraw to avoid flicker
+}
+
+void wxSplitterWindow::OnEnterSash()
+{
+ SetResizeCursor();
+
+ RedrawIfHotSensitive(true);
+}
+
+void wxSplitterWindow::OnLeaveSash()
+{
+ SetCursor(*wxSTANDARD_CURSOR);
+
+ RedrawIfHotSensitive(false);
+}
+
+void wxSplitterWindow::SetResizeCursor()
+{
+ SetCursor(m_splitMode == wxSPLIT_VERTICAL ? m_sashCursorWE
+ : m_sashCursorNS);
+}
+
+// ----------------------------------------------------------------------------
+// other event handlers
+// ----------------------------------------------------------------------------
+
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()
{
- if (m_needUpdating)
+ wxWindow::OnInternalIdle();
+
+ // if this is the first idle time after a sash position has potentially
+ // been set, allow SizeWindows to check for a requested size.
+ if (!m_checkRequestedSashPosition)
+ {
+ m_checkRequestedSashPosition = true;
SizeWindows();
+ return; // it won't needUpdating in this case
+ }
- event.Skip();
+ if (m_needUpdating)
+ SizeWindows();
}
void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
{
- wxCoord x = (wxCoord)event.GetX(),
- y = (wxCoord)event.GetY();
-
- // reset the cursor
-#ifdef __WXMOTIF__
- SetCursor(* wxSTANDARD_CURSOR);
-#endif
-#ifdef __WXMSW__
- SetCursor(wxCursor());
-#endif
+ 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
+#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) )
{
- CaptureMouse();
-
+ // Start the drag now
m_dragMode = wxSPLIT_DRAG_DRAGGING;
- if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
+ // Capture mouse and set the cursor
+ CaptureMouse();
+ SetResizeCursor();
+
+ 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;
}
}
{
// 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 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 );
-
- wxSplitterEvent eventSplitter(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED,
- this);
- eventSplitter.m_data.pos = new_sash_position;
- if ( GetEventHandler()->ProcessEvent(eventSplitter) )
+ // 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 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;
+ m_windowTwo = NULL;
+ OnUnsplit(removedWindow);
+ wxSplitterEvent eventUnsplit(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
+ eventUnsplit.m_data.win = removedWindow;
+ (void)DoSendEvent(eventUnsplit);
+ 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;
+ m_windowTwo = NULL;
+ OnUnsplit(removedWindow);
+ wxSplitterEvent eventUnsplit(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
+ eventUnsplit.m_data.win = removedWindow;
+ (void)DoSendEvent(eventUnsplit);
+ 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) )
- {
- if ( m_splitMode == wxSPLIT_VERTICAL )
- {
- SetCursor(*m_sashCursorWE);
- }
- else
- {
- SetCursor(*m_sashCursorNS);
- }
- }
-#if defined(__WXGTK__) || defined(__WXMSW__)
+ if ( event.Leaving() || !SashHitTest(x, y) )
+ OnLeaveSash();
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__
+ OnEnterSash();
}
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 =
- (int) ( 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;
#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;
- m_needUpdating = TRUE;
+ DoSetSashPosition(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);
+ }
+ else
+ {
+ event.Skip();
}
}
// 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() )
+ wxWindow *parent = wxGetTopLevelParent(this);
+ bool iconized;
+
+ wxTopLevelWindow *winTop = wxDynamicCast(parent, wxTopLevelWindow);
+ if ( winTop )
{
- parent = parent->GetParent();
+ iconized = winTop->IsIconized();
}
-
- bool iconized = FALSE;
- wxFrame *frame = wxDynamicCast(parent, wxFrame);
- if ( frame )
- iconized = frame->IsIconized();
else
{
- wxDialog *dialog = wxDynamicCast(parent, wxDialog);
- if ( dialog )
- iconized = dialog->IsIconized();
- else
- wxFAIL_MSG(wxT("should have a top level frame or dialog parent!"));
+ wxFAIL_MSG(wxT("should have a top level parent!"));
+
+ iconized = false;
}
if ( iconized )
{
+ m_lastSize = wxSize(0,0);
+
event.Skip();
+
+ return;
}
- else
+
+ if ( m_windowTwo )
{
- int cw, ch;
- GetClientSize( &cw, &ch );
- if ( m_windowTwo )
+ int w, h;
+ 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 )
{
- if ( m_splitMode == wxSPLIT_VERTICAL )
+ int delta = (int) ( (size - old_size)*m_sashGravity );
+ if ( delta != 0 )
{
- 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);
+ int newPosition = m_sashPosition + delta;
+ if( newPosition < m_minimumPaneSize )
+ newPosition = m_minimumPaneSize;
+ SetSashPositionAndNotify(newPosition);
}
}
- SizeWindows();
+ if ( m_sashPosition >= size - 5 )
+ SetSashPositionAndNotify(wxMax(10, size - 40));
+ m_lastSize = wxSize(w,h);
}
+
+ SizeWindows();
}
-bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
+void wxSplitterWindow::SetSashGravity(double gravity)
{
- if ( m_windowTwo == NULL || m_sashPosition == 0)
- return FALSE; // No sash
+ wxCHECK_RET( gravity >= 0. && gravity <= 1.,
+ _T("invalid gravity value") );
- 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;
- }
+ m_sashGravity = gravity;
}
-// Draw 3D effect borders
-void wxSplitterWindow::DrawBorders(wxDC& dc)
+bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
{
- 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);
+ if ( m_windowTwo == NULL || m_sashPosition == 0)
+ return false; // No sash
- 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);
+ int z = m_splitMode == wxSPLIT_VERTICAL ? x : y;
+ int hitMin = m_sashPosition - tolerance;
+ int hitMax = m_sashPosition + GetSashSize() + tolerance;
- 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.
+ return z >= hitMin && z <= hitMax;
+}
- 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);
- }
+int wxSplitterWindow::GetSashSize() const
+{
+ return m_sashSize > -1 ? m_sashSize : wxRendererNative::Get().GetSplitterParams(this).widthSash;
+}
- dc.SetPen(wxNullPen);
- dc.SetBrush(wxNullBrush);
+int wxSplitterWindow::GetBorderSize() const
+{
+ return wxRendererNative::Get().GetSplitterParams(this).border;
}
// Draw the sash
void wxSplitterWindow::DrawSash(wxDC& dc)
{
- if ( m_sashPosition == 0 || !m_windowTwo)
- return;
- if (GetWindowStyle() & wxSP_NOSASH)
+ if (HasFlag(wxSP_3DBORDER))
+ wxRendererNative::Get().DrawSplitterBorder
+ (
+ this,
+ dc,
+ GetClientRect()
+ );
+
+ // don't draw sash if we're not split
+ if ( m_sashPosition == 0 || !m_windowTwo )
return;
- int w, h;
- GetClientSize(&w, &h);
-
- if ( GetWindowStyleFlag() & wxSP_3DSASH )
- {
- if ( m_splitMode == wxSPLIT_VERTICAL )
- {
- dc.SetPen(*m_facePen);
- 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);
-
- 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);
- 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);
- 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);
-
- 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);
- 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);
+ wxRendererNative::Get().DrawSplitterSash
+ (
+ this,
+ dc,
+ GetClientSize(),
+ m_sashPosition,
+ m_splitMode == wxSPLIT_VERTICAL ? wxVERTICAL
+ : wxHORIZONTAL,
+ m_isHot ? (int)wxCONTROL_CURRENT : 0
+ );
}
// Draw the sash tracker (for whilst moving the sash)
screenDC.DrawLine(x1, y1, x2, y2);
screenDC.SetLogicalFunction(wxCOPY);
+}
+
+int wxSplitterWindow::GetWindowSize() const
+{
+ wxSize size = GetClientSize();
- screenDC.SetPen(wxNullPen);
- screenDC.SetBrush(wxNullBrush);
+ return m_splitMode == wxSPLIT_VERTICAL ? size.x : size.y;
+}
+
+int wxSplitterWindow::AdjustSashPosition(int sashPos) const
+{
+ 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 = GetWindowSize() - minSize - GetBorderSize() - GetSashSize();
+ if ( maxSize > 0 && sashPos > maxSize && maxSize >= m_minimumPaneSize)
+ sashPos = maxSize;
+ }
+
+ 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)
+{
+ // 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;
+
+ // 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.
// including the edges next to the sash.
void wxSplitterWindow::SizeWindows()
{
+ // check if we have delayed setting the real sash position
+ if ( m_checkRequestedSashPosition && 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;
+ if (w2 < 0)
+ w2 = 0;
+ h2 = h - 2*border;
+ if (h2 < 0)
+ h2 = 0;
+ h1 = h2;
+ 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()));
+ 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;
}
+
+ GetWindow2()->SetSize(x2, y2, w2, h2);
+ GetWindow1()->SetSize(border, border, w1, h1);
}
+
wxClientDC dc(this);
- if ( GetBorderSize() > 0 )
- DrawBorders(dc);
DrawSash(dc);
- SetNeedUpdating(FALSE);
+ 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!") );
+
+ if (window && !window->IsShown())
+ window->Show();
+
m_windowOne = window;
- m_windowTwo = (wxWindow *) NULL;
- m_sashPosition = 0;
+ 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.
-bool wxSplitterWindow::SplitVertically(wxWindow *window1, wxWindow *window2, int sashPosition)
+// 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;
- int w, h;
- GetClientSize(&w, &h);
+ wxCHECK_MSG( window1 && window2, false,
+ _T("can not split with NULL window(s)") );
- m_splitMode = wxSPLIT_VERTICAL;
+ 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;
- if ( sashPosition > 0 )
- m_sashPosition = sashPosition;
- else if ( sashPosition < 0 )
- m_sashPosition = w + sashPosition; // It's negative so adding is subtracting
- else // default
- m_sashPosition = w/2;
+
+ // 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();
- return TRUE;
+ return true;
}
-bool wxSplitterWindow::SplitHorizontally(wxWindow *window1, wxWindow *window2, int sashPosition)
+int wxSplitterWindow::ConvertSashPosition(int sashPosition) const
{
- 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;
+ {
+ return sashPosition;
+ }
else if ( sashPosition < 0 )
- m_sashPosition = h + sashPosition; // It's negative so adding is subtracting
- else // default
- m_sashPosition = h/2;
-
- SizeWindows();
-
- return TRUE;
+ {
+ // It's negative so adding is subtracting
+ return GetWindowSize() + sashPosition;
+ }
+ else // sashPosition == 0
+ {
+ // default, put it in the centre
+ return GetWindowSize() / 2;
+ }
}
-
// Remove the specified (or second) window from the view
// Doesn't actually delete the window.
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;
}
- SendUnsplitEvent(win);
- m_sashPosition = 0;
+ 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;
+ int pos = m_requestedSashPosition != INT_MAX ? m_requestedSashPosition : m_sashPosition;
+ SetSashPosition(pos); // re-check limits
}
void wxSplitterWindow::SetSashPosition(int position, bool redraw)
{
- m_sashPosition = 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;
+ m_checkRequestedSashPosition = false;
+
+ DoSetSashPosition(ConvertSashPosition(position));
if ( redraw )
{
}
}
-// Initialize colours
-void wxSplitterWindow::InitColours()
+// 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()
{
- wxDELETE( m_facePen );
- wxDELETE( m_faceBrush );
- wxDELETE( m_mediumShadowPen );
- wxDELETE( m_darkShadowPen );
- wxDELETE( m_lightShadowPen );
- wxDELETE( m_hilightPen );
+ m_checkRequestedSashPosition = true;
+ SizeWindows();
+ m_checkRequestedSashPosition = false;
+}
- // Shadow colours
-#ifndef __WIN16__
- wxColour faceColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
- m_facePen = new wxPen(faceColour, 1, wxSOLID);
- m_faceBrush = new wxBrush(faceColour, wxSOLID);
+bool wxSplitterWindow::DoSendEvent(wxSplitterEvent& event)
+{
+ return !GetEventHandler()->ProcessEvent(event) || event.IsAllowed();
+}
- wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW));
- m_mediumShadowPen = new wxPen(mediumShadowColour, 1, wxSOLID);
+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);
- wxColour darkShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DDKSHADOW));
- m_darkShadowPen = new wxPen(darkShadowColour, 1, wxSOLID);
+ 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);
- wxColour lightShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT));
- m_lightShadowPen = new wxPen(lightShadowColour, 1, wxSOLID);
+ pSash = &sizeBest.y;
+ }
- wxColour hilightColour(wxSystemSettings::GetSystemColour(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__
-}
+ // account for the sash if the window is actually split
+ if ( m_windowOne && m_windowTwo )
+ *pSash += GetSashSize();
-void wxSplitterWindow::SendUnsplitEvent(wxWindow *winRemoved)
-{
- wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
- event.m_data.win = winRemoved;
+ // account for the border too
+ int border = 2*GetBorderSize();
+ sizeBest.x += border;
+ sizeBest.y += border;
- (void)GetEventHandler()->ProcessEvent(event);
+ return sizeBest;
}
// ---------------------------------------------------------------------------
-// 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 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
- || m_minimumPaneSize == 0 )
+ bool unsplit_scenario = false;
+ if ( m_permitUnsplitAlways || m_minimumPaneSize == 0 )
{
// Do edge detection if unsplit premitted
if ( newSashPosition <= UNSPLIT_THRESHOLD )
{
// 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 ( !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,
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
- if ( SashHitTest(event.GetX(), event.GetY()) )
+ if ( SashHitTest(event.GetX(), event.GetY(), 0) )
{
// default processing is ok
event.Skip();
}
//else: do nothing, in particular, don't call Skip()
-#endif // wxMSW
}
+
+#endif // wxMSW || wxMac
+
+#endif // wxUSE_SPLITTER
+
projects / wxWidgets.git / blobdiff