// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "splitter.h"
#endif
#include "wx/wxprec.h"
#if wxUSE_SPLITTER
+
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#include "wx/settings.h"
#endif
+#include "wx/renderer.h"
+
#include "wx/splitter.h"
#include <stdlib.h>
DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_UNSPLIT)
IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)
+
+/*
+ TODO PROPERTIES
+ style wxSP_3D
+ sashpos (long , 0 )
+ minsize (long -1 )
+ object, object_ref
+ orientation
+*/
+
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__)
// allow TABbing from one window to the other
style |= wxTAB_TRAVERSAL;
- if (!wxWindow::Create(parent, id, pos, size, style, name))
+ // we draw our border ourselves to blend the sash with it
+ style &= ~wxBORDER_MASK;
+ style |= wxBORDER_NONE;
+
+ 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;
}
m_oldY = 0;
m_firstX = 0;
m_firstY = 0;
- m_sashSize = 3;
- m_borderSize = 0;
m_sashPosition = m_requestedSashPosition = 0;
m_minimumPaneSize = 0;
m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE);
m_sashCursorNS = 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;
-
- InitColours();
m_needUpdating = FALSE;
+ m_isHot = false;
}
wxSplitterWindow::~wxSplitterWindow()
{
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()
: 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()
{
+ wxWindow::OnInternalIdle();
+
if (m_needUpdating)
SizeWindows();
-
- event.Skip();
}
void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
int x = (int)event.GetX(),
y = (int)event.GetY();
-#if defined(__WXMSW__)
- // SetCursor(wxCursor()); // Is this required?
-#endif
-
if (GetWindowStyle() & wxSP_NOSASH)
return;
} // left up && dragging
else if ((event.Moving() || event.Leaving() || event.Entering()) && (m_dragMode == wxSPLIT_DRAG_NONE))
{
- // Just change the cursor as required
- if ( !event.Leaving() && SashHitTest(x, y) )
- {
- SetResizeCursor();
- }
+ if ( event.Leaving() || !SashHitTest(x, y) )
+ OnLeaveSash();
else
- {
- SetCursor(* wxSTANDARD_CURSOR);
- }
+ OnEnterSash();
}
else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING))
{
parent = parent->GetParent();
}
- bool iconized = FALSE;
+ bool iconized;
- // wxMotif doesn't yet have a wxTopLevelWindow implementation
-#ifdef __WXMOTIF__
- wxFrame *winTop = wxDynamicCast(parent, wxFrame);
-#else
wxTopLevelWindow *winTop = wxDynamicCast(parent, wxTopLevelWindow);
-#endif
if ( winTop )
{
iconized = winTop->IsIconized();
}
-#ifndef __WXMOTIF__
else
{
wxFAIL_MSG(wxT("should have a top level parent!"));
iconized = FALSE;
}
-#endif
if ( iconized )
{
return;
}
- int cw, ch;
- GetClientSize( &cw, &ch );
if ( m_windowTwo )
{
- if ( m_splitMode == wxSPLIT_VERTICAL )
- {
- if ( m_sashPosition >= (cw - 5) )
- SetSashPositionAndNotify(wxMax(10, cw - 40));
- }
- else // m_splitMode == wxSPLIT_HORIZONTAL
- {
- if ( m_sashPosition >= (ch - 5) )
- SetSashPositionAndNotify(wxMax(10, ch - 40));
- }
+ int w, h;
+ GetClientSize(&w, &h);
+
+ int size = m_splitMode == wxSPLIT_VERTICAL ? w : h;
+ if ( m_sashPosition >= size - 5 )
+ SetSashPositionAndNotify(wxMax(10, size - 40));
}
SizeWindows();
if ( m_windowTwo == NULL || m_sashPosition == 0)
return FALSE; // No sash
- 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;
- }
+ int z = m_splitMode == wxSPLIT_VERTICAL ? x : y;
+
+ return z >= m_sashPosition - tolerance &&
+ z <= m_sashPosition + GetSashSize() + tolerance;
}
-// Draw 3D effect borders
-void wxSplitterWindow::DrawBorders(wxDC& dc)
+int wxSplitterWindow::GetSashSize() const
{
- 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);
-
- 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);
-
- 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.
-
- 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);
- }
+ return 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);
-
- 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);
- 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);
-
- 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);
-
- 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);
-
- // Bottom
- dc.SetPen(*m_darkShadowPen);
- dc.DrawLine(m_sashPosition+1, h-m_borderSize-1, m_sashPosition+m_sashSize-1, h-m_borderSize-1);
- }
- }
- else // wxSPLIT_HORIZONTAL
- {
- dc.SetPen(*m_facePen);
- 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(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);
-
- 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);
-
- 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 // !wxSP_3DSASH
- {
- dc.SetPen(*wxTRANSPARENT_PEN);
- dc.SetBrush(*m_faceBrush);
- if ( m_splitMode == wxSPLIT_VERTICAL )
- {
- 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 // wxSPLIT_HORIZONTAL
- {
- 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 ? wxCONTROL_CURRENT : 0
+ );
}
// Draw the sash tracker (for whilst moving the sash)
screenDC.DrawLine(x1, y1, x2, y2);
screenDC.SetLogicalFunction(wxCOPY);
-
- screenDC.SetPen(wxNullPen);
- screenDC.SetBrush(wxNullBrush);
}
int wxSplitterWindow::GetWindowSize() const
}
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;
+ h1 =
+ h2 = h - 2*border;
+ 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()));
+ w1 =
+ w2 = w - 2*border;
+ h1 = size1;
+ h2 = h - 2*border - sash - h1;
+ x2 = border;
+ y2 = size2;
}
+
+ GetWindow1()->SetSize(border, border, w1, h1);
+ GetWindow2()->SetSize(x2, y2, w2, h2);
}
+
wxClientDC dc(this);
- if ( GetBorderSize() > 0 )
- DrawBorders(dc);
DrawSash(dc);
SetNeedUpdating(FALSE);
if ( ! IsSplit() )
return FALSE;
- wxWindow *win = NULL;
+ wxWindow *win;
if ( toRemove == NULL || toRemove == m_windowTwo)
{
win = m_windowTwo ;
}
}
-// Initialize colours
-void wxSplitterWindow::InitColours()
-{
- wxDELETE( m_facePen );
- wxDELETE( m_faceBrush );
- wxDELETE( m_mediumShadowPen );
- wxDELETE( m_darkShadowPen );
- wxDELETE( m_lightShadowPen );
- wxDELETE( m_hilightPen );
-
- // Shadow colours
-#ifndef __WIN16__
- wxColour faceColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
- m_facePen = new wxPen(faceColour, 1, wxSOLID);
- m_faceBrush = new wxBrush(faceColour, wxSOLID);
-
- wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
- m_mediumShadowPen = new wxPen(mediumShadowColour, 1, wxSOLID);
-
- wxColour darkShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW));
- m_darkShadowPen = new wxPen(darkShadowColour, 1, wxSOLID);
-
- wxColour lightShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT));
- m_lightShadowPen = new wxPen(lightShadowColour, 1, wxSOLID);
-
- wxColour hilightColour(wxSystemSettings::GetColour(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__
-}
-
bool wxSplitterWindow::DoSendEvent(wxSplitterEvent& event)
{
return !GetEventHandler()->ProcessEvent(event) || event.IsAllowed();
//else: do nothing, in particular, don't call Skip()
}
+#endif // wxMSW || wxMac
+
#endif // wxUSE_SPLITTER
-#endif // wxMSW
projects / wxWidgets.git / blobdiff