X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c7f49f569dcabe360a3a51a94eff77225b39d69..fe164c3e2ea5453896cd63a5440a26365daec1bc:/src/generic/renderg.cpp diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index a37f9462b1..7f121bef42 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Name: generic/renderg.cpp -// Purpose: generic implementation of wxRendererBase (for any platform) +// Purpose: generic implementation of wxRendererNative (for any platform) // Author: Vadim Zeitlin // Modified by: // Created: 20.07.2003 @@ -28,30 +28,61 @@ #include "wx/string.h" #endif //WX_PRECOMP +#include "wx/gdicmn.h" +#include "wx/dc.h" + +#include "wx/settings.h" +#include "wx/splitter.h" + #include "wx/renderer.h" // ---------------------------------------------------------------------------- -// wxRendererGeneric: our wxRendererBase implementation +// wxRendererGeneric: our wxRendererNative implementation // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRendererGeneric : public wxRendererBase +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); + + + 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 // ============================================================================ // ---------------------------------------------------------------------------- @@ -59,7 +90,7 @@ public: // ---------------------------------------------------------------------------- /* static */ -wxRendererNative *wxRendererGeneric::GetGeneric() +wxRendererNative& wxRendererNative::GetGeneric() { static wxRendererGeneric s_rendererGeneric; @@ -70,47 +101,84 @@ wxRendererNative *wxRendererGeneric::GetGeneric() #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXGTK__) /* static */ -wxRendererNative& wxRendererGeneric::Get() +wxRendererNative& wxRendererNative::Get() { return GetGeneric(); } #endif // platforms using their own renderers +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)) +{ +} + +// ---------------------------------------------------------------------------- +// 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 m_corner = 1; + const int CORNER = 1; - dc->SetBrush( *wxTRANSPARENT_BRUSH ); + const wxCoord x = rect.x, + y = rect.y, + w = rect.width, + h = rect.height; - dc->SetPen( *wxBLACK_PEN ); - dc->DrawLine( x+w-m_corner+1, y, x+w, y+h ); // right (outer) - dc->DrawRectangle( x, y+h, w+1, 1 ); // bottom (outer) + dc.SetBrush(*wxTRANSPARENT_BRUSH); - wxPen pen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID ); + 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) - dc->SetPen( pen ); - dc->DrawLine( x+w-m_corner, y, x+w-1, y+h ); // right (inner) - dc->DrawRectangle( x+1, y+h-1, w-2, 1 ); // bottom (inner) + 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->DrawRectangle( x, y, w-m_corner+1, 1 ); // top (outer) - dc->DrawRectangle( x, y, 1, h ); // left (outer) - dc->DrawLine( x, y+h-1, x+1, y+h-1 ); - dc->DrawLine( x+w-1, y, x+w-1, y+1 ); + 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 ); + dc.DrawLine( x+w-1, y, x+w-1, y+1 ); } // draw the plus or minus sign void -wxRendererGeneric::DrawTreeItemButton(wxWindow *win, +wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win), wxDC& dc, const wxRect& rect, int flags) @@ -126,11 +194,84 @@ wxRendererGeneric::DrawTreeItemButton(wxWindow *win, dc.SetPen(*wxBLACK_PEN); dc.DrawLine(xMiddle - 2, yMiddle, xMiddle + 3, yMiddle); - if ( !item->IsExpanded() ) + 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& dc, + const wxSize& size, + wxCoord position) +{ + // 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); + } +}