X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04857cb707be4de8083e599fc2e1967c77eb7f5e..fe02c2c2dd5db8ad75ff5c6d37396dee8bb608f3:/src/generic/renderg.cpp diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 9f409c3e98..138321f6bf 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: generic/renderg.cpp +// Name: src/generic/renderg.cpp // Purpose: generic implementation of wxRendererNative (for any platform) // Author: Vadim Zeitlin // Modified by: @@ -24,18 +24,18 @@ #pragma hdrstop #endif +#include "wx/renderer.h" + #ifndef WX_PRECOMP #include "wx/string.h" + #include "wx/dc.h" + #include "wx/settings.h" + #include "wx/gdicmn.h" #endif //WX_PRECOMP -#include "wx/gdicmn.h" -#include "wx/dc.h" - -#include "wx/settings.h" #include "wx/splitter.h" #include "wx/dcmirror.h" #include "wx/module.h" -#include "wx/renderer.h" // ---------------------------------------------------------------------------- // wxRendererGeneric: our wxRendererNative implementation @@ -68,6 +68,30 @@ public: wxOrientation orient, int flags = 0); + virtual void DrawComboBoxDropButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + + virtual void DrawDropArrow(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + + virtual void DrawCheckBox(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + + virtual void DrawPushButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); + + virtual void DrawItemSelectionRect(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags = 0); virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win); @@ -125,7 +149,7 @@ void wxRendererGeneric::Cleanup() { if (sm_rendererGeneric) delete sm_rendererGeneric; - + sm_rendererGeneric = NULL; } @@ -206,21 +230,28 @@ wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win), const wxRect& rect, int flags) { - // white background - dc.SetPen(*wxGREY_PEN); - dc.SetBrush(*wxWHITE_BRUSH); - dc.DrawRectangle(rect.Deflate(1, 2)); + // store settings + wxDCPenChanger penChanger(dc, *wxGREY_PEN); + wxDCBrushChanger brushChanger(dc, *wxWHITE_BRUSH); + + dc.DrawRectangle(rect); // black lines const wxCoord xMiddle = rect.x + rect.width/2; const wxCoord yMiddle = rect.y + rect.height/2; + // half of the length of the horz lines in "-" and "+" + const wxCoord halfWidth = rect.width/2 - 2; dc.SetPen(*wxBLACK_PEN); - dc.DrawLine(xMiddle - 2, yMiddle, xMiddle + 3, yMiddle); + dc.DrawLine(xMiddle - halfWidth, yMiddle, + xMiddle + halfWidth + 1, yMiddle); + if ( !(flags & wxCONTROL_EXPANDED) ) { // turn "-" into "+" - dc.DrawLine(xMiddle, yMiddle - 2, xMiddle, yMiddle + 3); + const wxCoord halfHeight = rect.height/2 - 2; + dc.DrawLine(xMiddle, yMiddle - halfHeight, + xMiddle, yMiddle + halfHeight + 1); } } @@ -235,16 +266,17 @@ wxRendererGeneric::GetSplitterParams(const wxWindow *win) wxCoord sashWidth, border; - if ( win->HasFlag(wxSP_3D) ) - { + if ( win->HasFlag(wxSP_3DSASH) ) sashWidth = 7; - border = 2; - } + else if ( win->HasFlag(wxSP_NOSASH) ) + sashWidth = 0; else // no 3D effect - { sashWidth = 3; + + if ( win->HasFlag(wxSP_3DBORDER) ) + border = 2; + else // no 3D effect border = 0; - } return wxSplitterRenderParams(sashWidth, border, false); } @@ -255,7 +287,7 @@ wxRendererGeneric::DrawSplitterBorder(wxWindow *win, const wxRect& rectOrig, int WXUNUSED(falgs)) { - if ( win->HasFlag(wxSP_3D) ) + if ( win->HasFlag(wxSP_3DBORDER) ) { wxRect rect = rectOrig; DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight); @@ -297,39 +329,145 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win, const wxCoord h = size.y; wxCoord offset = 0; - - // If we're not drawing the border, droppings will - // be left unless we make the sash shorter - if ( !win->HasFlag(wxSP_3DBORDER) ) + + // If we're drawing the border, draw the sash 3d lines shorter + if ( win->HasFlag(wxSP_3DBORDER) ) { - offset = 3; + offset = 1; } - // from left to right - if ( win->HasFlag(wxSP_3D) ) + dc.SetPen(*wxTRANSPARENT_PEN); + dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE))); + + if ( win->HasFlag(wxSP_3DSASH) ) { + // Draw the 3D sash + dc.DrawRectangle(position + 2, 0, 3, h); + dc.SetPen(m_penLightGrey); - dc.DrawLine(position, 1 + offset, position, h - 1 - offset); + dc.DrawLine(position, offset, position, h - offset); dc.SetPen(m_penHighlight); - dc.DrawLine(position + 1, offset, position + 1, h - offset); + dc.DrawLine(position + 1, 0, position + 1, h); + + dc.SetPen(m_penDarkGrey); + dc.DrawLine(position + 5, 0, position + 5, h); + + dc.SetPen(m_penBlack); + dc.DrawLine(position + 6, offset, position + 6, h - offset); + } + else + { + // Draw a flat sash + dc.DrawRectangle(position, 0, 3, h); } +} - dc.SetPen(*wxTRANSPARENT_PEN); - dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE))); - dc.DrawRectangle(position + 2, offset, 3, h - 2*offset); +// ---------------------------------------------------------------------------- +// button drawing +// ---------------------------------------------------------------------------- - if ( win->HasFlag(wxSP_3D) ) +void +wxRendererGeneric::DrawComboBoxDropButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags) +{ + DrawPushButton(win,dc,rect,flags); + DrawDropArrow(win,dc,rect,flags); +} + +void +wxRendererGeneric::DrawDropArrow(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int WXUNUSED(flags)) +{ + // This generic implementation should be good + // enough for Windows platforms (including XP). + + int arrowHalf = rect.width/5; + int rectMid = rect.width / 2; + int arrowTopY = (rect.height/2) - (arrowHalf/2); + + // This should always result in arrow with odd width. + wxPoint pt[] = { - dc.SetPen(m_penDarkGrey); - dc.DrawLine(position + 5, offset, position + 5, h - offset); + wxPoint(rectMid - arrowHalf, arrowTopY), + wxPoint(rectMid + arrowHalf, arrowTopY), + wxPoint(rectMid, arrowTopY + arrowHalf) + }; + dc.SetBrush(wxBrush(win->GetForegroundColour())); + dc.SetPen(wxPen(win->GetForegroundColour())); + dc.DrawPolygon(WXSIZEOF(pt), pt, rect.x, rect.y); +} - dc.SetPen(m_penBlack); - dc.DrawLine(position + 6, offset, position + 6, h - 1 - offset); +void +wxRendererGeneric::DrawCheckBox(wxWindow *WXUNUSED(win), + wxDC& dc, + const wxRect& rect, + int flags) +{ + dc.SetPen(*(flags & wxCONTROL_DISABLED ? wxGREY_PEN : wxBLACK_PEN)); + dc.SetBrush( *wxTRANSPARENT_BRUSH ); + dc.DrawRectangle(rect); + + if ( flags & wxCONTROL_CHECKED ) + { + dc.DrawCheckMark(rect.Deflate(2, 2)); } } +void +wxRendererGeneric::DrawPushButton(wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags) +{ + // Don't try anything too fancy. It'll just turn out looking + // out-of-place on most platforms. + wxColour bgCol = flags & wxCONTROL_DISABLED ? + wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE) : + win->GetBackgroundColour(); + dc.SetBrush(wxBrush(bgCol)); + dc.SetPen(wxPen(bgCol)); + dc.DrawRectangle(rect); +} + +void +wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win), + wxDC& dc, + const wxRect& rect, + int flags) +{ + wxBrush brush; + if ( flags & wxCONTROL_SELECTED ) + { + if ( flags & wxCONTROL_FOCUSED ) + { + brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)); + } + else // !focused + { + brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW)); + } + } + else // !selected + { + brush = *wxTRANSPARENT_BRUSH; + } + + dc.SetBrush(brush); + dc.SetPen(flags & wxCONTROL_CURRENT ? *wxBLACK_PEN : *wxTRANSPARENT_PEN); + + dc.DrawRectangle( rect ); +} + + +// ---------------------------------------------------------------------------- // A module to allow cleanup of generic renderer. +// ---------------------------------------------------------------------------- + class wxGenericRendererModule: public wxModule { DECLARE_DYNAMIC_CLASS(wxGenericRendererModule) @@ -340,4 +478,3 @@ public: }; IMPLEMENT_DYNAMIC_CLASS(wxGenericRendererModule, wxModule) -