// Author: Julian Smart
// Modified by:
// Created: 01/02/97
-// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include <stdlib.h>
-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 );
+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)
m_windowOne = m_windowTwo;
m_windowTwo = NULL;
OnUnsplit(removedWindow);
- wxSplitterEvent eventUnsplit(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
+ wxSplitterEvent eventUnsplit(wxEVT_SPLITTER_UNSPLIT, this);
eventUnsplit.m_data.win = removedWindow;
(void)DoSendEvent(eventUnsplit);
SetSashPositionAndNotify(0);
wxWindow *removedWindow = m_windowTwo;
m_windowTwo = NULL;
OnUnsplit(removedWindow);
- wxSplitterEvent eventUnsplit(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
+ wxSplitterEvent eventUnsplit(wxEVT_SPLITTER_UNSPLIT, this);
eventUnsplit.m_data.win = removedWindow;
(void)DoSendEvent(eventUnsplit);
SetSashPositionAndNotify(0);
return;
}
- if ( m_windowTwo )
- {
- int w, h;
- GetClientSize(&w, &h);
+ const wxSize curSize = event.GetSize();
- int size = m_splitMode == wxSPLIT_VERTICAL ? w : h;
+ // 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 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. In particular,
- // it is important that we don't reset our sash position because it's
- // out of current range in this case as otherwise the really requested
- // position would be lost and never set. Wait until we get a real size
- // event with our non-initial size to do it.
+ // Don't do anything if the size didn't really change.
if ( size != old_size )
{
+ int newPosition = -1;
+
+ // Apply gravity if we use it.
int delta = (int) ( (size - old_size)*m_sashGravity );
if ( delta != 0 )
{
- int newPosition = m_sashPosition + delta;
+ 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);
+ // 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();
}
m_sashGravity = gravity;
}
-bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
+bool wxSplitterWindow::SashHitTest(int x, int y)
{
if ( m_windowTwo == NULL || m_sashPosition == 0)
return false; // No sash
int z = m_splitMode == wxSPLIT_VERTICAL ? x : y;
- int hitMin = m_sashPosition - tolerance;
- int hitMax = m_sashPosition + GetSashSize() + tolerance;
+ int hitMax = m_sashPosition + GetSashSize() - 1;
+
+ return z >= m_sashPosition && z <= hitMax;
+}
- return z >= hitMin && 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
// must generate a CHANGED event at the end of resizing
DoSetSashPosition(sashPos);
- wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, this);
+ wxSplitterEvent event(wxEVT_SPLITTER_SASH_POS_CHANGED, this);
event.m_data.pos = m_sashPosition;
(void)DoSendEvent(event);
//
// 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);
}
// 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(), 0) )
+ if ( SashHitTest(event.GetX(), event.GetY()) )
{
// default processing is ok
event.Skip();