comctl32: The RECT in the custom draw structure should be the entire item's…

comctl32: The RECT in the custom draw structure should be the entire item's size. This includes any separated dropdown arrow.

comctl32: The RECT in the custom draw structure should be the entire item's…
6af0d441 · Huw Davies · Alexandre Julliard · d130ba09 · 6af0d441
Commit 6af0d441 authored Jul 08, 2014 by Huw Davies Committed by Alexandre Julliard Jul 08, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

toolbar.c dlls/comctl32/toolbar.c +2 -2

No files found.
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -954,7 +954,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, 
    tbcd.rcText.bottom = rcText.bottom - rc.top;
    tbcd.nmcd.uItemState = TOOLBAR_TranslateState(btnPtr);
    tbcd.nmcd.hdc = hdc;
-    tbcd.nmcd.rc = rc;
+    tbcd.nmcd.rc = btnPtr->rect;
    tbcd.hbrMonoDither = COMCTL32_hPattern55AABrush;

    /* FIXME: what are these used for? */
@@ -972,7 +972,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, 
 	ntfret = TOOLBAR_SendNotify(&tbcd.nmcd.hdr, infoPtr, NM_CUSTOMDRAW);
        /* reset these fields so the user can't alter the behaviour like native */
        tbcd.nmcd.hdc = hdc;
-        tbcd.nmcd.rc = rc;
+        tbcd.nmcd.rc = btnPtr->rect;

 	dwItemCustDraw = ntfret & 0xffff;
 	dwItemCDFlag = ntfret & 0xffff0000;