X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c32ed26a2b5aab5b8ea3c40af69e22ead895a32..ffc71ce59daf0b93697aac0a50bb3fdb9391b0ca:/src/msw/menuitem.cpp diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index 83af40f8b3..a5233965bf 100644 --- a/src/msw/menuitem.cpp +++ b/src/msw/menuitem.cpp @@ -30,6 +30,8 @@ #include "wx/stockitem.h" #ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/dcmemory.h" #include "wx/font.h" #include "wx/bitmap.h" #include "wx/settings.h" @@ -239,6 +241,15 @@ public: static const MenuDrawData* Get() { + // notice that s_menuData can't be created as a global variable because + // it needs a window to initialize and no windows exist at the time of + // globals initialization yet + if ( !ms_instance ) + { + static MenuDrawData s_menuData; + ms_instance = &s_menuData; + } + #if wxUSE_UXTHEME bool theme = MenuLayout() == FullTheme; if ( ms_instance->Theme != theme ) @@ -249,7 +260,6 @@ public: MenuDrawData() { - ms_instance = this; Init(); } @@ -297,8 +307,6 @@ private: MenuDrawData* MenuDrawData::ms_instance = NULL; -MenuDrawData s_menuData; - void MenuDrawData::Init() { #if wxUSE_UXTHEME @@ -779,7 +787,7 @@ bool wxMenuItem::OnMeasureItem(size_t *width, size_t *height) if ( IsOwnerDrawn() ) { - // width of menu icon in ownerdrawn menu + // width of menu icon with margins in ownerdrawn menu // if any bitmap is not set, the width of space reserved for icon // image is equal to the width of std check mark, // if bitmap is set, then the width is set to the width of the widest @@ -833,8 +841,7 @@ bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc, RECT rect; wxCopyRectToRECT(rc, rect); - int imgWidth = wxMax(GetMarginWidth(), data->CheckSize.cx) - + data->CheckMargin.left + data->CheckMargin.right; + int imgWidth = wxMax(GetMarginWidth(), data->CheckSize.cx); if ( IsOwnerDrawn() ) { @@ -869,12 +876,19 @@ bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc, CopyRect(&rcGutter, &rcSelection); rcGutter.right = data->ItemMargin.left + data->CheckBgMargin.left + + data->CheckMargin.left + imgWidth + + data->CheckMargin.right + data->CheckBgMargin.right; CopyRect(&rcText, &rcSelection); rcText.left = rcGutter.right + data->TextBorder; + // we draw the text label vertically centered, but this results in it + // being 1px too low compared to native menus for some reason, fix it + if ( data->MenuLayout() != MenuDrawData::FullTheme ) + rcText.top--; + #if wxUSE_UXTHEME wxUxThemeEngine* theme = MenuDrawData::GetUxThemeEngine(); if ( theme ) @@ -1011,64 +1025,25 @@ bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc, RECT rcImg; SetRect(&rcImg, - rect.left + data->ItemMargin.left + data->CheckBgMargin.left, - rect.top + data->ItemMargin.top + data->CheckBgMargin.top, - rect.left + data->ItemMargin.left + data->CheckBgMargin.left - + imgWidth, - rect.bottom - data->ItemMargin.bottom - data->CheckBgMargin.bottom); + rect.left + data->ItemMargin.left + + data->CheckBgMargin.left + + data->CheckMargin.left, + rect.top + data->ItemMargin.top + + data->CheckBgMargin.top + + data->CheckMargin.top, + rect.left + data->ItemMargin.left + + data->CheckBgMargin.left + + data->CheckMargin.left + + imgWidth, + rect.bottom - data->ItemMargin.bottom + - data->CheckBgMargin.bottom + - data->CheckMargin.bottom); if ( IsCheckable() && !m_bmpChecked.Ok() ) { if ( stat & wxODChecked ) { - #if wxUSE_UXTHEME - wxUxThemeEngine* theme = MenuDrawData::GetUxThemeEngine(); - if ( theme ) - { - wxUxThemeHandle hTheme(GetMenu()->GetWindow(), L"MENU"); - - POPUPCHECKBACKGROUNDSTATES stateCheckBg = (stat & wxODDisabled) - ? MCB_DISABLED - : MCB_NORMAL; - - theme->DrawThemeBackground(hTheme, hdc, MENU_POPUPCHECKBACKGROUND, - stateCheckBg, &rcImg, NULL); - - // check mark will be drawn centered on the background - - POPUPCHECKSTATES stateCheck = (stat & wxODDisabled) - ? MC_CHECKMARKDISABLED - : MC_CHECKMARKNORMAL; - - theme->DrawThemeBackground(hTheme, hdc, MENU_POPUPCHECK, - stateCheck, &rcImg, NULL); - } - else - #endif // wxUSE_UXTHEME - { - int cx = imgWidth; - int cy = rcImg.bottom - rcImg.top; - - // what goes on: DrawFrameControl creates a b/w mask, - // then we copy it to screen to have right colors - - // first create a monochrome bitmap in a memory DC - HDC hdcMem = ::CreateCompatibleDC(hdc); - HBITMAP hbmpCheck = ::CreateBitmap(cx, cy, 1, 1, 0); - ::SelectObject(hdcMem, hbmpCheck); - - // then draw a check mark into it - RECT rect = { 0, 0, cx, cy }; - if ( rc.GetHeight() > 0 ) - { - ::DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); - } - - // finally copy it to screen DC and clean up - ::BitBlt(hdc, rcImg.left, rcImg.top, cx, cy, hdcMem, 0, 0, SRCCOPY); - - ::DeleteDC(hdcMem); - } + DrawStdCheckMark((WXHDC)hdc, &rcImg, stat); } } else @@ -1120,6 +1095,129 @@ bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc, } +namespace +{ + +// helper function for draw coloured check mark +void DrawColorCheckMark(HDC hdc, int x, int y, int cx, int cy, HDC hdcCheckMask, int idxColor) +{ + const COLORREF colBlack = RGB(0, 0, 0); + const COLORREF colWhite = RGB(255, 255, 255); + + COLORREF colOldText = ::SetTextColor(hdc, colBlack); + COLORREF colOldBack = ::SetBkColor(hdc, colWhite); + int prevMode = SetBkMode(hdc, TRANSPARENT); + + // memory DC for color bitmap + MemoryHDC hdcMem(hdc); + CompatibleBitmap hbmpMem(hdc, cx, cy); + SelectInHDC selMem(hdcMem, hbmpMem); + + RECT rect = { 0, 0, cx, cy }; + ::FillRect(hdcMem, &rect, ::GetSysColorBrush(idxColor)); + + const COLORREF colCheck = ::GetSysColor(idxColor); + if ( colCheck == colWhite ) + { + ::BitBlt(hdc, x, y, cx, cy, hdcCheckMask, 0, 0, MERGEPAINT); + ::BitBlt(hdc, x, y, cx, cy, hdcMem, 0, 0, SRCAND); + } + else + { + if ( colCheck != colBlack ) + { + const DWORD ROP_DSna = 0x00220326; // dest = (NOT src) AND dest + ::BitBlt(hdcMem, 0, 0, cx, cy, hdcCheckMask, 0, 0, ROP_DSna); + } + + ::BitBlt(hdc, x, y, cx, cy, hdcCheckMask, 0, 0, SRCAND); + ::BitBlt(hdc, x, y, cx, cy, hdcMem, 0, 0, SRCPAINT); + } + + ::SetBkMode(hdc, prevMode); + ::SetBkColor(hdc, colOldBack); + ::SetTextColor(hdc, colOldText); +} + +} // anonymous namespace + +void wxMenuItem::DrawStdCheckMark(WXHDC hdc_, const RECT* rc, wxODStatus stat) +{ + HDC hdc = (HDC)hdc_; + +#if wxUSE_UXTHEME + wxUxThemeEngine* theme = MenuDrawData::GetUxThemeEngine(); + if ( theme ) + { + wxUxThemeHandle hTheme(GetMenu()->GetWindow(), L"MENU"); + + const MenuDrawData* data = MenuDrawData::Get(); + + // rect for background must be without check margins + RECT rcBg; + SetRect(&rcBg, + rc->left - data->CheckMargin.left, + rc->top - data->CheckMargin.top, + rc->right + data->CheckMargin.right, + rc->bottom + data->CheckMargin.bottom); + + POPUPCHECKBACKGROUNDSTATES stateCheckBg = (stat & wxODDisabled) + ? MCB_DISABLED + : MCB_NORMAL; + + theme->DrawThemeBackground(hTheme, hdc, MENU_POPUPCHECKBACKGROUND, + stateCheckBg, &rcBg, NULL); + + POPUPCHECKSTATES stateCheck; + if ( GetKind() == wxITEM_CHECK ) + { + stateCheck = (stat & wxODDisabled) ? MC_CHECKMARKDISABLED + : MC_CHECKMARKNORMAL; + } + else + { + stateCheck = (stat & wxODDisabled) ? MC_BULLETDISABLED + : MC_BULLETNORMAL; + } + + theme->DrawThemeBackground(hTheme, hdc, MENU_POPUPCHECK, + stateCheck, rc, NULL); + } + else +#endif // wxUSE_UXTHEME + { + int cx = rc->right - rc->left; + int cy = rc->bottom - rc->top; + + // first create mask of check mark + MemoryHDC hdcMask(hdc); + MonoBitmap hbmpMask(cx, cy); + SelectInHDC selMask(hdcMask,hbmpMask); + + // then draw a check mark into it + UINT stateCheck = (GetKind() == wxITEM_CHECK) ? DFCS_MENUCHECK + : DFCS_MENUBULLET; + RECT rect = { 0, 0, cx, cy }; + ::DrawFrameControl(hdcMask, &rect, DFC_MENU, stateCheck); + + // first draw shadow if disabled + if ( (stat & wxODDisabled) && !(stat & wxODSelected) ) + { + DrawColorCheckMark(hdc, rc->left + 1, rc->top + 1, + cx, cy, hdcMask, COLOR_3DHILIGHT); + } + + // then draw a check mark + int color = COLOR_MENUTEXT; + if ( stat & wxODDisabled ) + color = COLOR_BTNSHADOW; + else if ( stat & wxODSelected ) + color = COLOR_HIGHLIGHTTEXT; + + DrawColorCheckMark(hdc, rc->left, rc->top, cx, cy, hdcMask, color); + } +} + void wxMenuItem::GetFontToUse(wxFont& font) const { font = GetFont();