// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation "splitter.h"
-// #pragma interface
+ #pragma implementation "splitter.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
#ifndef WX_PRECOMP
-#include "wx/wx.h"
+ #include "wx/window.h"
+ #include "wx/dialog.h"
+ #include "wx/frame.h"
#endif
-#include <math.h>
#include <stdlib.h>
#include "wx/string.h"
#include "wx/splitter.h"
#include "wx/dcscreen.h"
+#include "wx/settings.h"
+#include "wx/log.h"
+#include "wx/utils.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)
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxCommandEvent)
BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
EVT_PAINT(wxSplitterWindow::OnPaint)
EVT_SIZE(wxSplitterWindow::OnSize)
+ EVT_IDLE(wxSplitterWindow::OnIdle)
EVT_MOUSE_EVENTS(wxSplitterWindow::OnMouseEvent)
+
+ 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)
+
+ WX_EVENT_TABLE_CONTROL_CONTAINER(wxSplitterWindow)
END_EVENT_TABLE()
-#endif
-wxSplitterWindow::wxSplitterWindow(void)
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow);
+
+bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name)
{
- m_splitMode = wxSPLIT_VERTICAL;
- 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_sashCursorWE = NULL;
- m_sashCursorNS = NULL;
- m_sashTrackerPen = NULL;
- m_lightShadowPen = NULL;
- m_mediumShadowPen = NULL;
- m_darkShadowPen = NULL;
- m_faceBrush = NULL;
- m_facePen = NULL;
- m_hilightPen = NULL;
- m_minimumPaneSize = 0;
+ // allow TABbing from one window to the other
+ style |= wxTAB_TRAVERSAL;
+
+ if (!wxWindow::Create(parent, id, pos, size, style, name))
+ return FALSE;
+
+ m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0;
+
+ if ( style & wxSP_3DSASH )
+ m_sashSize = 7;
+ else
+ m_sashSize = 3;
+
+ if ( style & wxSP_3DBORDER )
+ m_borderSize = 2;
+ else if ( style & wxSP_BORDER )
+ m_borderSize = 1;
+ else
+ m_borderSize = 0;
+
+#ifdef __WXMAC__
+ int major,minor;
+ wxGetOsVersion( &major, &minor );
+ if (major >= 10)
+ m_windowStyle |= wxSP_SASH_AQUA;
+#endif
+
+ return TRUE;
}
-wxSplitterWindow::wxSplitterWindow(wxWindow *parent, const wxWindowID id, const wxPoint& pos,
- const wxSize& size, const long style, const wxString& name)
- :wxWindow(parent, id, pos, size, style, name)
+void wxSplitterWindow::Init()
{
+ m_container.SetContainerWindow(this);
+
m_splitMode = wxSPLIT_VERTICAL;
- m_windowOne = NULL;
- m_windowTwo = NULL;
+ m_permitUnsplitAlways = TRUE;
+ m_windowOne = (wxWindow *) NULL;
+ m_windowTwo = (wxWindow *) NULL;
m_dragMode = wxSPLIT_DRAG_NONE;
m_oldX = 0;
m_oldY = 0;
m_sashCursorWE = new wxCursor(wxCURSOR_SIZEWE);
m_sashCursorNS = new wxCursor(wxCURSOR_SIZENS);
m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxSOLID);
- m_lightShadowPen = NULL;
- m_mediumShadowPen = NULL;
- m_darkShadowPen = NULL;
- m_faceBrush = NULL;
- m_facePen = NULL;
- m_hilightPen = NULL;
-
- if ( style & wxSP_3D )
- {
- m_borderSize = 2;
- m_sashSize = 7;
- }
- else if ( style & wxSP_BORDER )
- {
- m_borderSize = 1;
- m_sashSize = 3;
- }
- else
- {
- m_borderSize = 0;
- m_sashSize = 3;
- }
+ m_lightShadowPen = (wxPen *) NULL;
+ m_mediumShadowPen = (wxPen *) NULL;
+ m_darkShadowPen = (wxPen *) NULL;
+ m_faceBrush = (wxBrush *) NULL;
+ m_facePen = (wxPen *) NULL;
+ m_hilightPen = (wxPen *) NULL;
- // Eventually, we'll respond to colour change messages
- InitColours();
+ m_borderSize = 0;
+ m_sashSize = 3;
- SetDoubleClick(TRUE);
+ InitColours();
- // For debugging purposes, to see the background.
-// SetBackground(wxBLUE_BRUSH);
+ m_needUpdating = FALSE;
}
-wxSplitterWindow::~wxSplitterWindow(void)
+wxSplitterWindow::~wxSplitterWindow()
{
delete m_sashCursorWE;
delete m_sashCursorNS;
DrawSash(dc);
}
-void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
+void wxSplitterWindow::OnIdle(wxIdleEvent& event)
{
- long x, y;
- event.Position(&x, &y);
+ if (m_needUpdating)
+ SizeWindows();
- if (event.LeftDown())
- {
- if ( SashHitTest(x, y) )
- {
- CaptureMouse();
-
- // Required for X to specify that
- // that we wish to draw on top of all windows
- // - and we optimise by specifying the area
- // for creating the overlap window.
- wxScreenDC::StartDrawingOnTop(this);
-
- // We don't say we're dragging yet; we leave that
- // decision for the Dragging() branch, to ensure
- // the user has dragged a little bit.
- m_dragMode = wxSPLIT_DRAG_LEFT_DOWN;
- m_firstX = x;
- m_firstY = y;
- }
- }
- else if ( event.LeftUp() && m_dragMode == wxSPLIT_DRAG_LEFT_DOWN )
- {
- // Wasn't a proper drag
- ReleaseMouse();
- wxScreenDC::EndDrawingOnTop();
- m_dragMode = wxSPLIT_DRAG_NONE;
+ event.Skip();
+}
- SetCursor(*wxSTANDARD_CURSOR);
- wxSetCursor(*wxSTANDARD_CURSOR);
- }
- else if (event.LeftUp() && m_dragMode == wxSPLIT_DRAG_DRAGGING)
- {
- // We can stop dragging now and see what we've got.
- m_dragMode = wxSPLIT_DRAG_NONE;
- ReleaseMouse();
- // Erase old tracker
- DrawSashTracker(m_oldX, m_oldY);
+void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
+{
+ wxCoord x = (wxCoord)event.GetX(),
+ y = (wxCoord)event.GetY();
- // End drawing on top (frees the window used for drawing
- // over the screen)
- wxScreenDC::EndDrawingOnTop();
+ // reset the cursor
+#ifdef __WXMOTIF__
+ SetCursor(* wxSTANDARD_CURSOR);
+#endif
+#ifdef __WXMSW__
+ SetCursor(wxCursor());
+#endif
- int w, h;
- GetClientSize(&w, &h);
- if ( m_splitMode == wxSPLIT_VERTICAL )
+ if (GetWindowStyle() & wxSP_NOSASH)
+ return;
+
+ if (event.LeftDown())
+ {
+ if ( SashHitTest(x, y) )
{
- // First check if we should veto this resize because
- // the pane size is too small
- if ( wxMax(x, 0) < m_minimumPaneSize || wxMax((w - x), 0) < m_minimumPaneSize)
- return;
+ CaptureMouse();
- if ( x <= 4 )
- {
- // We remove the first window from the view
- wxWindow *removedWindow = m_windowOne;
- m_windowOne = m_windowTwo;
- m_windowTwo = NULL;
+ m_dragMode = wxSPLIT_DRAG_DRAGGING;
- OnUnsplit(removedWindow);
- m_sashPosition = 0;
+ if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
+ {
+ DrawSashTracker(x, y);
}
- else if ( x >= (w - 4) )
+
+ m_oldX = x;
+ m_oldY = y;
+
+ if ( m_splitMode == wxSPLIT_VERTICAL )
{
- // We remove the second window from the view
- wxWindow *removedWindow = m_windowTwo;
- m_windowTwo = NULL;
- OnUnsplit(removedWindow);
- m_sashPosition = 0;
+ SetCursor(*m_sashCursorWE);
}
else
{
- m_sashPosition = x;
+ SetCursor(*m_sashCursorNS);
}
+ return;
}
- else
+ }
+ else if (event.LeftUp() && m_dragMode == wxSPLIT_DRAG_DRAGGING)
+ {
+ // We can stop dragging now and see what we've got.
+ m_dragMode = wxSPLIT_DRAG_NONE;
+ ReleaseMouse();
+
+ // Erase old tracker
+ if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
{
- // First check if we should veto this resize because
- // the pane size is too small
- if ( wxMax(y, 0) < m_minimumPaneSize || wxMax((h - y), 0) < m_minimumPaneSize)
+ 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) )
+ {
+ new_sash_position = eventSplitter.GetSashPosition();
+ if ( new_sash_position == -1 )
+ {
+ // change not allowed
return;
+ }
+ }
- if ( y <= 4 )
+ if ( m_permitUnsplitAlways || m_minimumPaneSize == 0 )
+ {
+ // Deal with possible unsplit scenarios
+ if ( new_sash_position == 0 )
{
// We remove the first window from the view
wxWindow *removedWindow = m_windowOne;
m_windowOne = m_windowTwo;
- m_windowTwo = NULL;
-
- OnUnsplit(removedWindow);
+ m_windowTwo = (wxWindow *) NULL;
+ SendUnsplitEvent(removedWindow);
m_sashPosition = 0;
}
- else if ( y >= (h - 4) )
+ else if ( new_sash_position == window_size )
{
// We remove the second window from the view
wxWindow *removedWindow = m_windowTwo;
- m_windowTwo = NULL;
- OnUnsplit(removedWindow);
+ m_windowTwo = (wxWindow *) NULL;
+ SendUnsplitEvent(removedWindow);
m_sashPosition = 0;
}
else
{
- m_sashPosition = y;
+ m_sashPosition = new_sash_position;
}
}
+ else
+ {
+ m_sashPosition = new_sash_position;
+ }
+
SizeWindows();
- }
- else if (event.Moving() && !event.Dragging())
- {
+ } // left up && dragging
+ else if (event.Moving() && !event.Dragging())
+ {
// Just change the cursor if required
if ( SashHitTest(x, y) )
{
- if ( m_splitMode == wxSPLIT_VERTICAL )
+ if ( m_splitMode == wxSPLIT_VERTICAL )
{
- SetCursor(*m_sashCursorWE);
- // Windows needs the following
- wxSetCursor(*m_sashCursorWE);
+ SetCursor(*m_sashCursorWE);
}
else
{
- SetCursor(*m_sashCursorNS);
- wxSetCursor(*m_sashCursorNS);
+ SetCursor(*m_sashCursorNS);
}
}
+#if defined(__WXGTK__) || defined(__WXMSW__)
else
{
- SetCursor(*wxSTANDARD_CURSOR);
- wxSetCursor(*wxSTANDARD_CURSOR);
+ // 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);
}
- }
- else if ( (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) ||
- (event.Dragging() && SashHitTest(x, y, 4)) )
- {
- if ( m_splitMode == wxSPLIT_VERTICAL )
- {
- SetCursor(*m_sashCursorWE);
- wxSetCursor(*m_sashCursorWE);
- }
- else
- {
- SetCursor(*m_sashCursorNS);
- wxSetCursor(*m_sashCursorNS);
- }
-
- // Detect that this is really a drag: we've moved more than 1 pixel either way
- if ((m_dragMode == wxSPLIT_DRAG_LEFT_DOWN) &&
-// (abs((int)x - m_firstX) > 1 || abs((int)y - m_firstY) > 1) )
- (abs((int)x - m_firstX) > 0 || abs((int)y - m_firstY) > 1) )
+#endif // __WXGTK__
+ }
+ 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 )
{
- m_dragMode = wxSPLIT_DRAG_DRAGGING;
- DrawSashTracker(x, y);
+ SetCursor(*m_sashCursorWE);
}
else
{
- if ( m_dragMode == wxSPLIT_DRAG_DRAGGING )
- {
- // Erase old tracker
- DrawSashTracker(m_oldX, m_oldY);
+ SetCursor(*m_sashCursorNS);
+ }
+#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) )
+ {
+ new_sash_position = eventSplitter.GetSashPosition();
+ if ( new_sash_position == -1 )
+ {
+ // change not allowed
+ return;
+ }
+ }
+
+ if (new_sash_position == m_sashPosition)
+ return;
- // Draw new one
- DrawSashTracker(x, y);
- }
+ // Erase old tracker
+ if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
+ {
+ DrawSashTracker(m_oldX, m_oldY);
}
+
+ if (m_splitMode == wxSPLIT_VERTICAL)
+ x = new_sash_position;
+ else
+ y = new_sash_position;
+
+ // Remember old positions
m_oldX = x;
m_oldY = 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;
+#endif // __WXMSW__
+
+ // Draw new one
+ if ((GetWindowStyleFlag() & wxSP_LIVE_UPDATE) == 0)
+ {
+ DrawSashTracker(m_oldX, m_oldY);
+ }
+ else
+ {
+ m_sashPosition = new_sash_position;
+ m_needUpdating = TRUE;
+ }
+ }
else if ( event.LeftDClick() )
{
- OnDoubleClickSash(x, y);
+ wxSplitterEvent eventSplitter(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED,
+ this);
+ eventSplitter.m_data.pt.x = x;
+ eventSplitter.m_data.pt.y = y;
+
+ (void)GetEventHandler()->ProcessEvent(eventSplitter);
+ }
+}
+
+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;
+ wxFrame *frame = wxDynamicCast(parent, wxFrame);
+ if ( frame )
+ iconized = frame->IsIconized();
else
{
- SetCursor(*wxSTANDARD_CURSOR);
- wxSetCursor(*wxSTANDARD_CURSOR);
+ wxDialog *dialog = wxDynamicCast(parent, wxDialog);
+ if ( dialog )
+ iconized = dialog->IsIconized();
+ else
+ wxFAIL_MSG(wxT("should have a top level frame or dialog parent!"));
}
-}
-void wxSplitterWindow::OnSize(wxSizeEvent& WXUNUSED(event))
-{
- int cw, ch;
- GetClientSize( &cw, &ch );
- if ( m_windowTwo )
+ if ( iconized )
{
- if ( m_splitMode == wxSPLIT_VERTICAL )
- {
- if ( m_sashPosition >= (cw - 5) )
- m_sashPosition = wxMax(10, cw - 40);
- }
- if ( m_splitMode == wxSPLIT_HORIZONTAL )
+ event.Skip();
+ }
+ else
+ {
+ int cw, ch;
+ GetClientSize( &cw, &ch );
+ if ( m_windowTwo )
{
- if ( m_sashPosition >= (ch - 5) )
- m_sashPosition = wxMax(10, ch - 40);
+ if ( m_splitMode == wxSPLIT_VERTICAL )
+ {
+ 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);
+ }
}
+
+ SizeWindows();
}
- SizeWindows();
}
-bool wxSplitterWindow::SashHitTest(const int x, const int y, const int tolerance)
+bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
{
if ( m_windowTwo == NULL || m_sashPosition == 0)
return FALSE; // No sash
else
return FALSE;
}
-
- return FALSE;
}
// Draw 3D effect borders
int w, h;
GetClientSize(&w, &h);
- if ( GetWindowStyleFlag() & wxSP_3D )
+ 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(0, 0, w-1, 0);
- dc.DrawLine(0, 0, 0, h - 1);
+ 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);
dc.SetPen(*m_darkShadowPen);
- dc.DrawLine(1, 1, w-2, 1);
- dc.DrawLine(1, 1, 1, h-2);
+ 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);
dc.SetPen(*m_hilightPen);
- dc.DrawLine(0, h-1, w-1, h-1);
- dc.DrawLine(w-1, 0, w-1, h); // Surely the maximum y pos. should be h - 1.
+ 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.
dc.SetPen(*m_lightShadowPen);
- dc.DrawLine(w-2, 1, w-2, h-2); // Right hand side
- dc.DrawLine(1, h-2, w-1, h-2); // Bottom
+ 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 )
{
{
if ( m_sashPosition == 0 || !m_windowTwo)
return;
+ if (GetWindowStyle() & wxSP_NOSASH)
+ return;
int w, h;
GetClientSize(&w, &h);
- if ( GetWindowStyleFlag() & wxSP_3D )
+ 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);
+
+ if (HasFlag( wxSP_SASH_AQUA ))
+ dc.SetBrush(*wxWHITE_BRUSH);
+ else
+ dc.SetBrush(*m_faceBrush);
+ dc.DrawRectangle(m_sashPosition + 2, 0 , m_sashSize - 4, h );
dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.SetPen(*m_lightShadowPen);
- dc.DrawLine(m_sashPosition, 1, m_sashPosition, h-2);
+ 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, 0, m_sashPosition+1, h);
+ dc.DrawLine(m_sashPosition+1, m_borderSize - 2, m_sashPosition+1, h - m_borderSize+2);
+
+ if (!HasFlag( wxSP_SASH_AQUA ))
+ 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_mediumShadowPen);
- dc.DrawLine(m_sashPosition+m_sashSize-2, 1, m_sashPosition+m_sashSize-2, h-1);
+ if (HasFlag( wxSP_SASH_AQUA ))
+ dc.SetPen(*m_lightShadowPen);
+ else
+ 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);
- dc.SetPen(*m_darkShadowPen);
- dc.DrawLine(m_sashPosition+m_sashSize-1, 2, m_sashPosition+m_sashSize-1, h-2);
+ // 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(0, m_sashPosition + 2, w, m_sashSize - 4);
+ if (HasFlag( wxSP_SASH_AQUA ))
+ dc.SetBrush(*wxWHITE_BRUSH);
+ else
+ 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(1, m_sashPosition, w-2, m_sashPosition);
+ dc.DrawLine(m_borderSize-1, m_sashPosition, w-m_borderSize, m_sashPosition);
dc.SetPen(*m_hilightPen);
- dc.DrawLine(0, m_sashPosition+1, w, m_sashPosition+1);
+ dc.DrawLine(m_borderSize-2, m_sashPosition+1, w-m_borderSize+1, m_sashPosition+1);
- dc.SetPen(*m_mediumShadowPen);
- dc.DrawLine(1, m_sashPosition+m_sashSize-2, w-1, m_sashPosition+m_sashSize-2);
+ if (!HasFlag( wxSP_SASH_AQUA ))
+ 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(2, m_sashPosition+m_sashSize-1, w-2, m_sashPosition+m_sashSize-1);
+ if (HasFlag( wxSP_SASH_AQUA ))
+ dc.SetPen(*m_lightShadowPen);
+ else
+ 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
dc.SetPen(*wxBLACK_PEN);
dc.SetBrush(*wxBLACK_BRUSH);
int h1 = h-1;
- if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER )
+ int y1 = 0;
+ if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER )
h1 += 1; // Not sure why this is necessary...
- dc.DrawRectangle(m_sashPosition, 0, m_sashSize, h1);
+ 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;
- if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER )
+ int x1 = 0;
+ if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER )
w1 ++;
-
- dc.DrawRectangle(0, m_sashPosition, w1, m_sashSize);
+ if ( (GetWindowStyleFlag() & wxSP_3DBORDER) == wxSP_3DBORDER)
+ {
+ x1 = 2; w1 -= 3;
+ }
+ dc.DrawRectangle(x1, m_sashPosition, w1, m_sashSize);
}
}
}
// Draw the sash tracker (for whilst moving the sash)
-void wxSplitterWindow::DrawSashTracker(const int x, const int y)
+void wxSplitterWindow::DrawSashTracker(int x, int y)
{
int w, h;
GetClientSize(&w, &h);
ClientToScreen(&x1, &y1);
ClientToScreen(&x2, &y2);
- screenDC.SetLogicalFunction(wxXOR);
+ screenDC.SetLogicalFunction(wxINVERT);
screenDC.SetPen(*m_sashTrackerPen);
screenDC.SetBrush(*wxTRANSPARENT_BRUSH);
// Position and size subwindows.
// Note that the border size applies to each subwindow, not
// including the edges next to the sash.
-void wxSplitterWindow::SizeWindows(void)
+void wxSplitterWindow::SizeWindows()
{
int w, h;
GetClientSize(&w, &h);
- if ( m_windowOne && !m_windowTwo )
+ if ( GetWindow1() && !GetWindow2() )
{
- m_windowOne->SetSize(m_borderSize, m_borderSize, w - 2*m_borderSize, h - 2*m_borderSize);
+ GetWindow1()->SetSize(GetBorderSize(), GetBorderSize(), w - 2*GetBorderSize(), h - 2*GetBorderSize());
+
}
- else if ( m_windowOne && m_windowTwo )
+ else if ( GetWindow1() && GetWindow2() )
{
- if (m_splitMode == wxSPLIT_VERTICAL)
+ if (GetSplitMode() == wxSPLIT_VERTICAL)
{
- int x1 = m_borderSize;
- int y1 = m_borderSize;
- int w1 = m_sashPosition - m_borderSize;
- int h1 = h - 2*m_borderSize;
-
- int x2 = m_sashPosition + m_sashSize;
- int y2 = m_borderSize;
- int w2 = w - 2*m_borderSize - m_sashSize - w1;
- int h2 = h - 2*m_borderSize;
-
- m_windowOne->SetSize(x1, y1,
- w1, h1);
- m_windowTwo->SetSize(x2, y2,
- w2, h2);
+ 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);
}
else
{
- m_windowOne->SetSize(m_borderSize, m_borderSize,
- w - 2*m_borderSize, m_sashPosition - m_borderSize);
- m_windowTwo->SetSize(m_borderSize, m_sashPosition + m_sashSize,
- w - 2*m_borderSize, h - 2*m_borderSize - m_sashSize - (m_sashPosition - m_borderSize));
+ GetWindow1()->SetSize(GetBorderSize(), GetBorderSize(),
+ w - 2*GetBorderSize(), GetSashPosition() - GetBorderSize());
+ GetWindow2()->SetSize(GetBorderSize(), GetSashPosition() + GetSashSize(),
+ w - 2*GetBorderSize(), h - 2*GetBorderSize() - GetSashSize() - (GetSashPosition() - GetBorderSize()));
}
}
wxClientDC dc(this);
- DrawBorders(dc);
+ if ( GetBorderSize() > 0 )
+ DrawBorders(dc);
DrawSash(dc);
+
+ SetNeedUpdating(FALSE);
}
// Set pane for unsplit window
void wxSplitterWindow::Initialize(wxWindow *window)
{
m_windowOne = window;
- m_windowTwo = NULL;
+ m_windowTwo = (wxWindow *) NULL;
m_sashPosition = 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, const int sashPosition)
+bool wxSplitterWindow::SplitVertically(wxWindow *window1, wxWindow *window2, int sashPosition)
{
if ( IsSplit() )
return FALSE;
+ int w, h;
+ GetClientSize(&w, &h);
+
m_splitMode = wxSPLIT_VERTICAL;
m_windowOne = window1;
m_windowTwo = window2;
- if ( sashPosition == -1 )
- m_sashPosition = 100;
- else
+ 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;
SizeWindows();
return TRUE;
}
-bool wxSplitterWindow::SplitHorizontally(wxWindow *window1, wxWindow *window2, const int sashPosition)
+bool wxSplitterWindow::SplitHorizontally(wxWindow *window1, wxWindow *window2, int sashPosition)
{
if ( IsSplit() )
return FALSE;
+ int w, h;
+ GetClientSize(&w, &h);
+
m_splitMode = wxSPLIT_HORIZONTAL;
m_windowOne = window1;
m_windowTwo = window2;
- if ( sashPosition == -1 )
- m_sashPosition = 100;
- else
+ if ( sashPosition > 0 )
m_sashPosition = sashPosition;
+ else if ( sashPosition < 0 )
+ m_sashPosition = h + sashPosition; // It's negative so adding is subtracting
+ else // default
+ m_sashPosition = h/2;
SizeWindows();
if ( ! IsSplit() )
return FALSE;
+ wxWindow *win = NULL;
if ( toRemove == NULL || toRemove == m_windowTwo)
{
- wxWindow *win = m_windowTwo ;
- m_windowTwo = NULL;
- m_sashPosition = 0;
- OnUnsplit(win);
- SizeWindows();
+ win = m_windowTwo ;
+ m_windowTwo = (wxWindow *) NULL;
}
else if ( toRemove == m_windowOne )
{
- wxWindow *win = m_windowOne ;
+ win = m_windowOne ;
m_windowOne = m_windowTwo;
- m_windowTwo = NULL;
- m_sashPosition = 0;
- OnUnsplit(win);
- SizeWindows();
+ m_windowTwo = (wxWindow *) NULL;
}
else
+ {
+ wxFAIL_MSG(wxT("splitter: attempt to remove a non-existent window"));
+
return FALSE;
+ }
+
+ SendUnsplitEvent(win);
+ m_sashPosition = 0;
+ SizeWindows();
return TRUE;
}
-void wxSplitterWindow::SetSashPosition(const int position, const bool redraw)
+// Replace a window with another one
+bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew)
{
- m_sashPosition = position;
+ wxCHECK_MSG( winOld, FALSE, wxT("use one of Split() functions instead") );
+ wxCHECK_MSG( winNew, FALSE, wxT("use Unsplit() functions instead") );
- if ( redraw )
+ if ( winOld == m_windowTwo )
{
- SizeWindows();
+ m_windowTwo = winNew;
+ }
+ else if ( winOld == m_windowOne )
+ {
+ m_windowOne = winNew;
}
+ else
+ {
+ wxFAIL_MSG(wxT("splitter: attempt to replace a non-existent window"));
+
+ return FALSE;
+ }
+
+ SizeWindows();
+
+ return TRUE;
}
-// Called when the sash is double-clicked.
-// The default behaviour is to remove the sash if the
-// minimum pane size is zero.
-void wxSplitterWindow::OnDoubleClickSash(int WXUNUSED(x), int WXUNUSED(y) )
+void wxSplitterWindow::SetSashPosition(int position, bool redraw)
{
- if ( GetMinimumPaneSize() == 0 )
+ m_sashPosition = position;
+
+ if ( redraw )
{
- Unsplit();
+ SizeWindows();
}
}
// Initialize colours
-void wxSplitterWindow::InitColours(void)
+void wxSplitterWindow::InitColours()
{
- if ( m_facePen )
- delete m_facePen;
- if ( m_faceBrush )
- delete m_faceBrush;
- if ( m_mediumShadowPen )
- delete m_mediumShadowPen;
- if ( m_darkShadowPen )
- delete m_darkShadowPen;
- if ( m_lightShadowPen )
- delete m_lightShadowPen;
- if ( m_hilightPen )
- delete m_hilightPen;
+ wxDELETE( m_facePen );
+ wxDELETE( m_faceBrush );
+ wxDELETE( m_mediumShadowPen );
+ wxDELETE( m_darkShadowPen );
+ wxDELETE( m_lightShadowPen );
+ wxDELETE( m_hilightPen );
// Shadow colours
-#if defined(__WIN95__)
-// COLORREF ref = ::GetSysColor(COLOR_3DFACE); // Normally light grey
+#ifndef __WIN16__
wxColour faceColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
m_facePen = new wxPen(faceColour, 1, wxSOLID);
m_faceBrush = new wxBrush(faceColour, wxSOLID);
-// ref = ::GetSysColor(COLOR_3DSHADOW); // Normally dark grey
wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW));
m_mediumShadowPen = new wxPen(mediumShadowColour, 1, wxSOLID);
-// ref = ::GetSysColor(COLOR_3DDKSHADOW); // Normally black
wxColour darkShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DDKSHADOW));
m_darkShadowPen = new wxPen(darkShadowColour, 1, wxSOLID);
-// ref = ::GetSysColor(COLOR_3DLIGHT); // Normally light grey
wxColour lightShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT));
m_lightShadowPen = new wxPen(lightShadowColour, 1, wxSOLID);
-// ref = ::GetSysColor(COLOR_3DHILIGHT); // Normally white
wxColour hilightColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT));
m_hilightPen = new wxPen(hilightColour, 1, wxSOLID);
#else
m_darkShadowPen = new wxPen("BLACK", 1, wxSOLID);
m_lightShadowPen = new wxPen("LIGHT GREY", 1, wxSOLID);
m_hilightPen = new wxPen("WHITE", 1, wxSOLID);
-#endif
+#endif // __WIN16__
+}
+
+void wxSplitterWindow::SendUnsplitEvent(wxWindow *winRemoved)
+{
+ wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
+ event.m_data.win = winRemoved;
+
+ (void)GetEventHandler()->ProcessEvent(event);
+}
+
+// ---------------------------------------------------------------------------
+// splitter event handlers
+// ---------------------------------------------------------------------------
+
+void wxSplitterWindow::OnSashPosChanged(wxSplitterEvent& event)
+{
+ // If within UNSPLIT_THRESHOLD from edge, set to edge to cause closure.
+ const int UNSPLIT_THRESHOLD = 4;
+
+ int newSashPosition = event.GetSashPosition();
+
+ // Obtain relevant window dimension for bottom / right threshold check
+ int w, h;
+ GetClientSize(&w, &h);
+ int window_size = (m_splitMode == wxSPLIT_VERTICAL) ? w : h ;
+
+ 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;
+ }
+ if ( newSashPosition >= window_size - UNSPLIT_THRESHOLD )
+ {
+ // threshold bottom/right check
+ newSashPosition = window_size;
+ 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;
+ }
+
+ // 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;
+
+ // for compatibility, call the virtual function
+ if ( !OnSashPositionChange(newSashPosition) )
+ {
+ newSashPosition = -1;
+ }
+
+ event.SetSashPosition(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)
+{
+ // for compatibility, call the virtual function
+ OnDoubleClickSash(event.GetX(), event.GetY());
+
+ if ( GetMinimumPaneSize() == 0 || m_permitUnsplitAlways )
+ {
+ Unsplit();
+ }
}
+void wxSplitterWindow::OnUnsplitEvent(wxSplitterEvent& event)
+{
+ 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);
+}
+
+#if defined(__WXMSW__)
+ #define WXUNUSED_UNLESS_MSW(identifier) identifier
+#else
+ #define WXUNUSED_UNLESS_MSW(identifier) WXUNUSED(identifier)
+#endif
+
+void wxSplitterWindow::OnSetCursor(wxSetCursorEvent& WXUNUSED_UNLESS_MSW(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()) )
+ {
+ // default processing is ok
+ event.Skip();
+ }
+ //else: do nothing, in particular, don't call Skip()
+#endif // wxMSW
+}
projects / wxWidgets.git / blobdiff