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

Fix off by 1 errors in owner-drawn menu drawing code in wxMSW.

Browse Source 
The label was offset by 1 pixel vertically and the check marks were 1 pixel
too wide compared to the native ones under XP, correct this.

Closes #11420 (again).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-01-23 13:22:07 +00:00
parent 85ee88cd53
commit 03cc29918f
1 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/msw/menuitem.cpp
View File

@@ -779,7 +779,7 @@ bool wxMenuItem::OnMeasureItem(size_t *width, size_t *height)
if ( IsOwnerDrawn() ) 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 // if any bitmap is not set, the width of space reserved for icon
// image is equal to the width of std check mark, // 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 // if bitmap is set, then the width is set to the width of the widest
@@ -833,8 +833,7 @@ bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc,
RECT rect; RECT rect;
wxCopyRectToRECT(rc, rect); wxCopyRectToRECT(rc, rect);
int imgWidth = wxMax(GetMarginWidth(), data->CheckSize.cx) int imgWidth = wxMax(GetMarginWidth(), data->CheckSize.cx);
+ data->CheckMargin.left + data->CheckMargin.right;
if ( IsOwnerDrawn() ) if ( IsOwnerDrawn() )
{ {
@@ -869,12 +868,19 @@ bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc,
CopyRect(&rcGutter, &rcSelection); CopyRect(&rcGutter, &rcSelection);
rcGutter.right = data->ItemMargin.left rcGutter.right = data->ItemMargin.left
+ data->CheckBgMargin.left + data->CheckBgMargin.left
+ data->CheckMargin.left
+ imgWidth + imgWidth
+ data->CheckMargin.right
+ data->CheckBgMargin.right; + data->CheckBgMargin.right;
CopyRect(&rcText, &rcSelection); CopyRect(&rcText, &rcSelection);
rcText.left = rcGutter.right + data->TextBorder; 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 #if wxUSE_UXTHEME
wxUxThemeEngine* theme = MenuDrawData::GetUxThemeEngine(); wxUxThemeEngine* theme = MenuDrawData::GetUxThemeEngine();
if ( theme ) if ( theme )
@@ -1011,11 +1017,19 @@ bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc,
RECT rcImg; RECT rcImg;
SetRect(&rcImg, SetRect(&rcImg,
rect.left + data->ItemMargin.left + data->CheckBgMargin.left, rect.left + data->ItemMargin.left
rect.top + data->ItemMargin.top + data->CheckBgMargin.top, + data->CheckBgMargin.left
rect.left + data->ItemMargin.left + data->CheckBgMargin.left + data->CheckMargin.left,
+ imgWidth, rect.top + data->ItemMargin.top
rect.bottom - data->ItemMargin.bottom - data->CheckBgMargin.bottom); + 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 ( IsCheckable() && !m_bmpChecked.Ok() )
{ {
@@ -1127,14 +1141,22 @@ void wxMenuItem::DrawStdCheckMark(HDC hdc, const RECT* rc, wxODStatus stat)
{ {
wxUxThemeHandle hTheme(GetMenu()->GetWindow(), L"MENU"); 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) POPUPCHECKBACKGROUNDSTATES stateCheckBg = (stat & wxODDisabled)
? MCB_DISABLED ? MCB_DISABLED
: MCB_NORMAL; : MCB_NORMAL;
theme->DrawThemeBackground(hTheme, hdc, MENU_POPUPCHECKBACKGROUND, theme->DrawThemeBackground(hTheme, hdc, MENU_POPUPCHECKBACKGROUND,
stateCheckBg, rc, NULL); stateCheckBg, &rcBg, NULL);
// check mark will be drawn centered on the background
POPUPCHECKSTATES stateCheck; POPUPCHECKSTATES stateCheck;
if ( GetKind() == wxITEM_CHECK ) if ( GetKind() == wxITEM_CHECK )