Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-05-05 17:56:18 +00:00
parent 44cba02ea7
commit 066bd25191
1 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/msw/renderer.cpp
View File

@@ -31,6 +31,7 @@
#include "wx/settings.h" #include "wx/settings.h"
#endif //WX_PRECOMP #endif //WX_PRECOMP
#include "wx/dcgraph.h"
#include "wx/scopeguard.h" #include "wx/scopeguard.h"
#include "wx/splitter.h" #include "wx/splitter.h"
#include "wx/renderer.h" #include "wx/renderer.h"
@@ -113,6 +114,28 @@
#define DFCS_HOT 0x1000 #define DFCS_HOT 0x1000
#endif #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<wxGCDC*>(&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 // methods common to wxRendererMSW and wxRendererXP
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -394,8 +417,10 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
const wxRect& rect, const wxRect& rect,
int flags) int flags)
{ {
wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect);
RECT r; RECT r;
wxCopyRectToRECT(rect, r); wxCopyRectToRECT(adjustedRect, r);
int style = DFCS_SCROLLCOMBOBOX; int style = DFCS_SCROLLCOMBOBOX;
if ( flags & wxCONTROL_DISABLED ) if ( flags & wxCONTROL_DISABLED )
@@ -414,8 +439,10 @@ wxRendererMSW::DoDrawFrameControl(UINT type,
const wxRect& rect, const wxRect& rect,
int flags) int flags)
{ {
wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect);
RECT r; RECT r;
wxCopyRectToRECT(rect, r); wxCopyRectToRECT(adjustedRect, r);
int style = kind; int style = kind;
if ( flags & wxCONTROL_CHECKED ) if ( flags & wxCONTROL_CHECKED )
@@ -615,8 +642,10 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
return; return;
} }
wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect);
RECT r; RECT r;
wxCopyRectToRECT(rect, r); wxCopyRectToRECT(adjustedRect, r);
int state; int state;
if ( flags & wxCONTROL_PRESSED ) if ( flags & wxCONTROL_PRESSED )
@@ -654,8 +683,10 @@ wxRendererXP::DrawHeaderButton(wxWindow *win,
return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params); return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params);
} }
wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect);
RECT r; RECT r;
wxCopyRectToRECT(rect, r); wxCopyRectToRECT(adjustedRect, r);
int state; int state;
if ( flags & wxCONTROL_PRESSED ) if ( flags & wxCONTROL_PRESSED )
@@ -696,8 +727,10 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win,
return; return;
} }
wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect);
RECT r; RECT r;
wxCopyRectToRECT(rect, r); wxCopyRectToRECT(adjustedRect, r);
int state = flags & wxCONTROL_EXPANDED ? GLPS_OPENED : GLPS_CLOSED; int state = flags & wxCONTROL_EXPANDED ? GLPS_OPENED : GLPS_CLOSED;
wxUxThemeEngine::Get()->DrawThemeBackground wxUxThemeEngine::Get()->DrawThemeBackground
@@ -734,8 +767,10 @@ wxRendererXP::DoDrawButtonLike(HTHEME htheme,
const wxRect& rect, const wxRect& rect,
int flags) int flags)
{ {
wxRect adjustedRect = applyGDIPlusTransformsToRect(dc, rect);
RECT r; RECT r;
wxCopyRectToRECT(rect, r); wxCopyRectToRECT(adjustedRect, r);
// the base state is always 1, whether it is PBS_NORMAL, // the base state is always 1, whether it is PBS_NORMAL,
// {CBS,RBS}_UNCHECKEDNORMAL or CBS_NORMAL // {CBS,RBS}_UNCHECKEDNORMAL or CBS_NORMAL