X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/942d5e2d7223bde6ae7aceab3ddb3d417b55d48c..57d3e26697255a5c5154b4a0dc26d6eab23ff871:/src/msw/renderer.cpp diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index 6ae0300275..380ad2e383 100644 --- a/src/msw/renderer.cpp +++ b/src/msw/renderer.cpp @@ -6,7 +6,7 @@ // Created: 20.07.2003 // RCS-ID: $Id$ // Copyright: (c) 2003 Vadim Zeitlin -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -31,6 +31,7 @@ #include "wx/settings.h" #endif //WX_PRECOMP +#include "wx/dcgraph.h" #include "wx/scopeguard.h" #include "wx/splitter.h" #include "wx/renderer.h" @@ -92,6 +93,12 @@ #define TMT_TEXTCOLOR 3803 #define TMT_BORDERCOLOR 3801 #define TMT_EDGEFILLCOLOR 3808 + + #define WP_MINBUTTON 15 + #define WP_MAXBUTTON 17 + #define WP_CLOSEBUTTON 18 + #define WP_RESTOREBUTTON 21 + #define WP_HELPBUTTON 23 #endif #if defined(__WXWINCE__) @@ -107,6 +114,28 @@ #define DFCS_HOT 0x1000 #endif +// When we're using GDI+, the DC might have transforms applied to it, +// but the renderer APIs don't respect them. So we need to apply +// the transforms to the rect ourselves. +inline +wxRect applyGDIPlusTransformsToRect(wxDC& dc, const wxRect& r) +{ + wxRect rect = r; +#if wxUSE_GRAPHICS_CONTEXT + wxGCDC* gcdc = dynamic_cast(&dc); + if (gcdc) + { + double xtrans = 0; + double ytrans = 0; + wxGraphicsContext* gc = gcdc->GetGraphicsContext(); + gc->GetTransform().TransformPoint(&xtrans, &ytrans); + rect.x = rect.x + (int)xtrans; + rect.y = rect.y + (int)ytrans; + } +#endif + return rect; +} + // ---------------------------------------------------------------------------- // methods common to wxRendererMSW and wxRendererXP // ---------------------------------------------------------------------------- @@ -181,18 +210,37 @@ public: DoDrawButton(DFCS_BUTTONRADIO, win, dc, rect, flags); } + virtual void DrawTitleBarBitmap(wxWindow *win, + wxDC& dc, + const wxRect& rect, + wxTitleBarButton button, + int flags = 0); + virtual wxSize GetCheckBoxSize(wxWindow *win); virtual int GetHeaderButtonHeight(wxWindow *win); + virtual int GetHeaderButtonMargin(wxWindow *win); + private: + // wrapper of DrawFrameControl() + void DoDrawFrameControl(UINT type, + UINT kind, + wxWindow *win, + wxDC& dc, + const wxRect& rect, + int flags); + // common part of Draw{PushButton,CheckBox,RadioBitmap}(): wraps // DrawFrameControl(DFC_BUTTON) void DoDrawButton(UINT kind, wxWindow *win, wxDC& dc, const wxRect& rect, - int flags); + int flags) + { + DoDrawFrameControl(DFC_BUTTON, kind, win, dc, rect, flags); + } wxDECLARE_NO_COPY_CLASS(wxRendererMSW); }; @@ -262,9 +310,24 @@ public: m_rendererNative.DrawRadioBitmap(win, dc, rect, flags); } + virtual void DrawTitleBarBitmap(wxWindow *win, + wxDC& dc, + const wxRect& rect, + wxTitleBarButton button, + int flags = 0); + virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win); private: + // wrapper around DrawThemeBackground() translating flags to NORMAL/HOT/ + // PUSHED/DISABLED states (and so suitable for drawing anything + // button-like) + void DoDrawButtonLike(HTHEME htheme, + int part, + wxDC& dc, + const wxRect& rect, + int flags); + // common part of DrawCheckBox(), DrawPushButton() and DrawRadioBitmap() bool DoDrawXPButton(int kind, wxWindow *win, @@ -354,8 +417,10 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win), const wxRect& rect, int flags) { + wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect); + RECT r; - wxCopyRectToRECT(rect, r); + wxCopyRectToRECT(adjustedRect, r); int style = DFCS_SCROLLCOMBOBOX; if ( flags & wxCONTROL_DISABLED ) @@ -367,14 +432,17 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win), } void -wxRendererMSW::DoDrawButton(UINT kind, - wxWindow * WXUNUSED(win), - wxDC& dc, - const wxRect& rect, - int flags) +wxRendererMSW::DoDrawFrameControl(UINT type, + UINT kind, + wxWindow * WXUNUSED(win), + wxDC& dc, + const wxRect& rect, + int flags) { + wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect); + RECT r; - wxCopyRectToRECT(rect, r); + wxCopyRectToRECT(adjustedRect, r); int style = kind; if ( flags & wxCONTROL_CHECKED ) @@ -388,7 +456,7 @@ wxRendererMSW::DoDrawButton(UINT kind, if ( flags & wxCONTROL_CURRENT ) style |= DFCS_HOT; - ::DrawFrameControl(GetHdcOf(dc.GetTempHDC()), &r, DFC_BUTTON, style); + ::DrawFrameControl(GetHdcOf(dc.GetTempHDC()), &r, type, style); } void @@ -411,6 +479,44 @@ wxRendererMSW::DrawPushButton(wxWindow *win, DoDrawButton(DFCS_BUTTONPUSH, win, dc, rect, flags); } +void +wxRendererMSW::DrawTitleBarBitmap(wxWindow *win, + wxDC& dc, + const wxRect& rect, + wxTitleBarButton button, + int flags) +{ + UINT kind; + switch ( button ) + { + case wxTITLEBAR_BUTTON_CLOSE: + kind = DFCS_CAPTIONCLOSE; + break; + + case wxTITLEBAR_BUTTON_MAXIMIZE: + kind = DFCS_CAPTIONMAX; + break; + + case wxTITLEBAR_BUTTON_ICONIZE: + kind = DFCS_CAPTIONMIN; + break; + + case wxTITLEBAR_BUTTON_RESTORE: + kind = DFCS_CAPTIONRESTORE; + break; + + case wxTITLEBAR_BUTTON_HELP: + kind = DFCS_CAPTIONHELP; + break; + + default: + wxFAIL_MSG( "unsupported title bar button" ); + return; + } + + DoDrawFrameControl(DFC_CAPTION, kind, win, dc, rect, flags); +} + wxSize wxRendererMSW::GetCheckBoxSize(wxWindow * WXUNUSED(win)) { return wxSize(::GetSystemMetrics(SM_CXMENUCHECK), @@ -440,6 +546,11 @@ int wxRendererMSW::GetHeaderButtonHeight(wxWindow * WXUNUSED(win)) return Header_Layout(hwndHeader, &hdl) ? wp.cy : DEFAULT_HEIGHT; } +int wxRendererMSW::GetHeaderButtonMargin(wxWindow *WXUNUSED(win)) +{ + return 10; +} + // Uses the theme to draw the border and fill for something like a wxTextCtrl void wxRendererMSW::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) { @@ -531,8 +642,10 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win, return; } + wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect); + RECT r; - wxCopyRectToRECT(rect, r); + wxCopyRectToRECT(adjustedRect, r); int state; if ( flags & wxCONTROL_PRESSED ) @@ -570,8 +683,10 @@ wxRendererXP::DrawHeaderButton(wxWindow *win, return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params); } + wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect); + RECT r; - wxCopyRectToRECT(rect, r); + wxCopyRectToRECT(adjustedRect, r); int state; if ( flags & wxCONTROL_PRESSED ) @@ -612,8 +727,10 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win, return; } + wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect); + RECT r; - wxCopyRectToRECT(rect, r); + wxCopyRectToRECT(adjustedRect, r); int state = flags & wxCONTROL_EXPANDED ? GLPS_OPENED : GLPS_CLOSED; wxUxThemeEngine::Get()->DrawThemeBackground @@ -638,29 +755,26 @@ wxRendererXP::DoDrawXPButton(int kind, if ( !hTheme ) return false; - RECT r; - wxCopyRectToRECT(rect, r); + DoDrawButtonLike(hTheme, kind, dc, rect, flags); - // determine the base state depending on the button kind - int state; - switch ( kind ) - { - case BP_PUSHBUTTON: - state = PBS_NORMAL; - break; + return true; +} - case BP_RADIOBUTTON: - state = RBS_UNCHECKEDNORMAL; - break; +void +wxRendererXP::DoDrawButtonLike(HTHEME htheme, + int part, + wxDC& dc, + const wxRect& rect, + int flags) +{ + wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect); - case BP_CHECKBOX: - state = CBS_UNCHECKEDNORMAL; - break; + RECT r; + wxCopyRectToRECT(adjustedRect, r); - default: - wxFAIL_MSG( "unknown button kind" ); - return false; - } + // the base state is always 1, whether it is PBS_NORMAL, + // {CBS,RBS}_UNCHECKEDNORMAL or CBS_NORMAL + int state = 1; // XBS_XXX is followed by XBX_XXXHOT, then XBS_XXXPRESSED and DISABLED enum @@ -687,20 +801,63 @@ wxRendererXP::DoDrawXPButton(int kind, else if ( flags & wxCONTROL_CURRENT ) state += HOT_OFFSET; // wxCONTROL_ISDEFAULT flag is only valid for push buttons - else if ( kind == BP_PUSHBUTTON && (flags & wxCONTROL_ISDEFAULT) ) + else if ( part == BP_PUSHBUTTON && (flags & wxCONTROL_ISDEFAULT) ) state = PBS_DEFAULTED; wxUxThemeEngine::Get()->DrawThemeBackground ( - hTheme, + htheme, GetHdcOf(dc.GetTempHDC()), - kind, + part, state, &r, NULL ); +} - return true; +void +wxRendererXP::DrawTitleBarBitmap(wxWindow *win, + wxDC& dc, + const wxRect& rect, + wxTitleBarButton button, + int flags) +{ + wxUxThemeHandle hTheme(win, L"WINDOW"); + if ( !hTheme ) + { + m_rendererNative.DrawTitleBarBitmap(win, dc, rect, button, flags); + return; + } + + int part; + switch ( button ) + { + case wxTITLEBAR_BUTTON_CLOSE: + part = WP_CLOSEBUTTON; + break; + + case wxTITLEBAR_BUTTON_MAXIMIZE: + part = WP_MAXBUTTON; + break; + + case wxTITLEBAR_BUTTON_ICONIZE: + part = WP_MINBUTTON; + break; + + case wxTITLEBAR_BUTTON_RESTORE: + part = WP_RESTOREBUTTON; + break; + + case wxTITLEBAR_BUTTON_HELP: + part = WP_HELPBUTTON; + break; + + default: + wxFAIL_MSG( "unsupported title bar button" ); + return; + } + + DoDrawButtonLike(hTheme, part, dc, rect, flags); } // ----------------------------------------------------------------------------