X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d999619920be2baad795640d5ef7d3e3cc8096e..30fd71e65bbbada8d17a0efbafbbbb3bafb42f9f:/src/generic/renderg.cpp diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 709f98b45c..15af1286b6 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -32,6 +32,9 @@ #include "wx/dc.h" #include "wx/settings.h" +#include "wx/splitter.h" + +#include "wx/dcmirror.h" #include "wx/renderer.h" @@ -42,21 +45,47 @@ class WXDLLEXPORT wxRendererGeneric : public wxRendererNative { public: - // draw the header control button (used by wxListCtrl) + wxRendererGeneric(); + virtual void DrawHeaderButton(wxWindow *win, wxDC& dc, const wxRect& rect, int flags = 0); - // draw the expanded/collapsed icon for a tree control item virtual void DrawTreeItemButton(wxWindow *win, wxDC& dc, const wxRect& rect, int flags = 0); + + virtual void DrawSplitterBorder(wxWindow *win, + wxDC& dc, + const wxRect& rect); + + virtual void DrawSplitterSash(wxWindow *win, + wxDC& dc, + const wxSize& size, + wxCoord position, + wxOrientation orient); + + + virtual wxPoint GetSplitterSashAndBorder(const wxWindow *win); + + +protected: + // draw the rectange using the first pen for the left and top sides and + // the second one for the bottom and right ones + void DrawShadedRect(wxDC& dc, wxRect *rect, + const wxPen& pen1, const wxPen& pen2); + + // the standard pens + wxPen m_penBlack, + m_penDarkGrey, + m_penLightGrey, + m_penHighlight; }; // ============================================================================ -// implementation +// wxRendererGeneric implementation // ============================================================================ // ---------------------------------------------------------------------------- @@ -71,26 +100,49 @@ wxRendererNative& wxRendererNative::GetGeneric() return s_rendererGeneric; } -// some platforms have their own renderers -#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXGTK__) - -/* static */ -wxRendererNative& wxRendererNative::Get() +wxRendererGeneric::wxRendererGeneric() + : m_penBlack(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW)), + m_penDarkGrey(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)), + m_penLightGrey(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)), + m_penHighlight(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT)) { - return GetGeneric(); } -#endif // platforms using their own renderers +// ---------------------------------------------------------------------------- +// wxRendererGeneric helpers +// ---------------------------------------------------------------------------- + +void +wxRendererGeneric::DrawShadedRect(wxDC& dc, + wxRect *rect, + const wxPen& pen1, + const wxPen& pen2) +{ + // draw the rectangle + dc.SetPen(pen1); + dc.DrawLine(rect->GetLeft(), rect->GetTop(), + rect->GetLeft(), rect->GetBottom()); + dc.DrawLine(rect->GetLeft() + 1, rect->GetTop(), + rect->GetRight(), rect->GetTop()); + dc.SetPen(pen2); + dc.DrawLine(rect->GetRight(), rect->GetTop(), + rect->GetRight(), rect->GetBottom()); + dc.DrawLine(rect->GetLeft(), rect->GetBottom(), + rect->GetRight() + 1, rect->GetBottom()); + + // adjust the rect + rect->Inflate(-1); +} // ---------------------------------------------------------------------------- -// wxRendererGeneric drawing functions +// tree/list ctrl drawing // ---------------------------------------------------------------------------- void -wxRendererGeneric::DrawHeaderButton(wxWindow *win, +wxRendererGeneric::DrawHeaderButton(wxWindow * WXUNUSED(win), wxDC& dc, const wxRect& rect, - int flags) + int WXUNUSED(flags)) { const int CORNER = 1; @@ -99,19 +151,17 @@ wxRendererGeneric::DrawHeaderButton(wxWindow *win, w = rect.width, h = rect.height; - dc.SetBrush( *wxTRANSPARENT_BRUSH ); + dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.SetPen( *wxBLACK_PEN ); + dc.SetPen(m_penBlack); dc.DrawLine( x+w-CORNER+1, y, x+w, y+h ); // right (outer) dc.DrawRectangle( x, y+h, w+1, 1 ); // bottom (outer) - wxPen pen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID ); - - dc.SetPen( pen ); + dc.SetPen(m_penDarkGrey); dc.DrawLine( x+w-CORNER, y, x+w-1, y+h ); // right (inner) dc.DrawRectangle( x+1, y+h-1, w-2, 1 ); // bottom (inner) - dc.SetPen( *wxWHITE_PEN ); + dc.SetPen(m_penHighlight); dc.DrawRectangle( x, y, w-CORNER+1, 1 ); // top (outer) dc.DrawRectangle( x, y, 1, h ); // left (outer) dc.DrawLine( x, y+h-1, x+1, y+h-1 ); @@ -120,7 +170,7 @@ wxRendererGeneric::DrawHeaderButton(wxWindow *win, // draw the plus or minus sign void -wxRendererGeneric::DrawTreeItemButton(wxWindow *win, +wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win), wxDC& dc, const wxRect& rect, int flags) @@ -136,11 +186,91 @@ wxRendererGeneric::DrawTreeItemButton(wxWindow *win, dc.SetPen(*wxBLACK_PEN); dc.DrawLine(xMiddle - 2, yMiddle, xMiddle + 3, yMiddle); - if ( flags & wxCONTROL_EXPANDED ) + if ( !(flags & wxCONTROL_EXPANDED) ) { // turn "-" into "+" dc.DrawLine(xMiddle, yMiddle - 2, xMiddle, yMiddle + 3); } } +// ---------------------------------------------------------------------------- +// sash drawing +// ---------------------------------------------------------------------------- + +wxPoint +wxRendererGeneric::GetSplitterSashAndBorder(const wxWindow *win) +{ + // see below + return win->HasFlag(wxSP_3D) ? wxPoint(7, 2) : wxPoint(3, 0); +} + +void +wxRendererGeneric::DrawSplitterBorder(wxWindow *win, + wxDC& dc, + const wxRect& rectOrig) +{ + if ( win->HasFlag(wxSP_3D) ) + { + wxRect rect = rectOrig; + DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight); + DrawShadedRect(dc, &rect, m_penBlack, m_penLightGrey); + } +} + +void +wxRendererGeneric::DrawSplitterSash(wxWindow *win, + wxDC& dcReal, + const wxSize& sizeReal, + wxCoord position, + wxOrientation orient) +{ + // to avoid duplicating the same code for horizontal and vertical sashes, + // simply mirror the DC instead if needed (i.e. if horz splitter) + wxMirrorDC dc(dcReal, orient != wxVERTICAL); + wxSize size = dc.Reflect(sizeReal); + + + // we draw a Win32-like grey sash with possible 3D border here: + // + // ---- this is position + // / + // v + // dWGGGDd + // GWGGGDB + // GWGGGDB where G is light grey (face) + // GWGGGDB W white (light) + // GWGGGDB D dark grey (shadow) + // GWGGGDB B black (dark shadow) + // GWGGGDB + // GWGGGDB and lower letters are our border (already drawn) + // GWGGGDB + // wWGGGDd + // + // only the middle 3 columns are drawn unless wxSP_3D is specified + + const wxCoord h = size.y; + + // from left to right + if ( win->HasFlag(wxSP_3D) ) + { + dc.SetPen(m_penLightGrey); + dc.DrawLine(position, 1, position, h - 1); + + dc.SetPen(m_penHighlight); + dc.DrawLine(position + 1, 0, position + 1, h); + } + + dc.SetPen(*wxTRANSPARENT_PEN); + dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE))); + dc.DrawRectangle(position + 2, 0, 3, h); + + if ( win->HasFlag(wxSP_3D) ) + { + dc.SetPen(m_penDarkGrey); + dc.DrawLine(position + 5, 0, position + 5, h); + + dc.SetPen(m_penBlack); + dc.DrawLine(position + 6, 1, position + 6, h - 1); + } +}