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

Optimize drawing owner-drawn button

Browse Source 
We have an optimized function to draw horizontal/vertical lines on DC with a non-rotated coordinate system so we can use it for drawing button frames.
This commit is contained in:
Artur Wieczorek
2019-10-17 17:33:09 +02:00
parent 147fc16f1e
commit 2b331a9463
1 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/msw/anybutton.cpp
View File

@@ -1012,12 +1012,12 @@ void DrawButtonText(HDC hdc,
} }
} }
void DrawRect(HDC hdc, const RECT& r) void DrawRect(HDC hdc, const RECT& r, COLORREF color)
{ {
wxDrawLine(hdc, r.left, r.top, r.right, r.top); wxDrawHVLine(hdc, r.left, r.top, r.right, r.top, color, 1);
wxDrawLine(hdc, r.right, r.top, r.right, r.bottom); wxDrawHVLine(hdc, r.right, r.top, r.right, r.bottom, color, 1);
wxDrawLine(hdc, r.right, r.bottom, r.left, r.bottom); wxDrawHVLine(hdc, r.right, r.bottom, r.left, r.bottom, color, 1);
wxDrawLine(hdc, r.left, r.bottom, r.left, r.top); wxDrawHVLine(hdc, r.left, r.bottom, r.left, r.top, color, 1);
} }
/* /*
@@ -1059,50 +1059,44 @@ void DrawButtonFrame(HDC hdc, RECT& rectBtn,
bool selected, bool pushed) bool selected, bool pushed)
{ {
RECT r; RECT r;
CopyRect(&r, &rectBtn); ::CopyRect(&r, &rectBtn);
AutoHPEN hpenBlack(GetSysColor(COLOR_3DDKSHADOW)), COLORREF clrBlack = ::GetSysColor(COLOR_3DDKSHADOW),
hpenGrey(GetSysColor(COLOR_3DSHADOW)), clrGrey = ::GetSysColor(COLOR_3DSHADOW),
hpenLightGr(GetSysColor(COLOR_3DLIGHT)), clrLightGr = ::GetSysColor(COLOR_3DLIGHT),
hpenWhite(GetSysColor(COLOR_3DHILIGHT)); clrWhite = ::GetSysColor(COLOR_3DHILIGHT);
SelectInHDC selectPen(hdc, hpenBlack);
r.right--; r.right--;
r.bottom--; r.bottom--;
if ( pushed ) if ( pushed )
{ {
DrawRect(hdc, r); DrawRect(hdc, r, clrBlack);
(void)SelectObject(hdc, hpenGrey);
::InflateRect(&r, -1, -1); ::InflateRect(&r, -1, -1);
DrawRect(hdc, r); DrawRect(hdc, r, clrGrey);
} }
else // !pushed else // !pushed
{ {
if ( selected ) if ( selected )
{ {
DrawRect(hdc, r); DrawRect(hdc, r, clrBlack);
::InflateRect(&r, -1, -1); ::InflateRect(&r, -1, -1);
} }
wxDrawLine(hdc, r.left, r.bottom, r.right, r.bottom); wxDrawHVLine(hdc, r.left, r.bottom, r.right, r.bottom, clrBlack, 1);
wxDrawLine(hdc, r.right, r.bottom, r.right, r.top - 1); wxDrawHVLine(hdc, r.right, r.bottom, r.right, r.top - 1, clrBlack, 1);
(void)SelectObject(hdc, hpenWhite); wxDrawHVLine(hdc, r.left, r.bottom - 1, r.left, r.top, clrWhite, 1);
wxDrawLine(hdc, r.left, r.bottom - 1, r.left, r.top); wxDrawHVLine(hdc, r.left, r.top, r.right, r.top, clrWhite, 1);
wxDrawLine(hdc, r.left, r.top, r.right, r.top);
(void)SelectObject(hdc, hpenLightGr); wxDrawHVLine(hdc, r.left + 1, r.bottom - 2, r.left + 1, r.top + 1, clrLightGr, 1);
wxDrawLine(hdc, r.left + 1, r.bottom - 2, r.left + 1, r.top + 1); wxDrawHVLine(hdc, r.left + 1, r.top + 1, r.right - 1, r.top + 1, clrLightGr, 1);
wxDrawLine(hdc, r.left + 1, r.top + 1, r.right - 1, r.top + 1);
(void)SelectObject(hdc, hpenGrey); wxDrawHVLine(hdc, r.left + 1, r.bottom - 1, r.right - 1, r.bottom - 1, clrGrey, 1);
wxDrawLine(hdc, r.left + 1, r.bottom - 1, r.right - 1, r.bottom - 1); wxDrawHVLine(hdc, r.right - 1, r.bottom - 1, r.right - 1, r.top, clrGrey, 1);
wxDrawLine(hdc, r.right - 1, r.bottom - 1, r.right - 1, r.top);
} }
InflateRect(&rectBtn, -OD_BUTTON_MARGIN, -OD_BUTTON_MARGIN); InflateRect(&rectBtn, -OD_BUTTON_MARGIN, -OD_BUTTON_MARGIN);
@@ -1225,10 +1219,29 @@ bool wxAnyButton::MSWIsPushed() const
return (SendMessage(GetHwnd(), BM_GETSTATE, 0, 0) & BST_PUSHED) != 0; return (SendMessage(GetHwnd(), BM_GETSTATE, 0, 0) & BST_PUSHED) != 0;
} }
#ifdef __WXDEBUG__
static inline bool IsNonTransformedDC(HDC hdc)
{
if ( ::GetGraphicsMode(hdc) == GM_ADVANCED )
return false;
SIZE devExt;
::GetViewportExtEx(hdc, &devExt);
SIZE logExt;
::GetWindowExtEx(hdc, &logExt);
return (devExt.cx == logExt.cx && devExt.cy == logExt.cy);
}
#endif // __WXDEBUG__
bool wxAnyButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis) bool wxAnyButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis)
{ {
LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT)wxdis; LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT)wxdis;
HDC hdc = lpDIS->hDC; HDC hdc = lpDIS->hDC;
// We expect here a DC with default settings (in GM_COMPATIBLE mode
// with non-scaled coordinates system) but will check this because
// our line drawing function wxDrawHVLine() works effectively only
// on a non-transformed DC.
wxASSERT(IsNonTransformedDC(hdc));
UINT state = lpDIS->itemState; UINT state = lpDIS->itemState;
switch ( GetButtonState(this, state) ) switch ( GetButtonState(this, state) )