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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6af0d44166e4fad8078a0311b3632a19856d390e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6af0d44166e4fad8078a0311b3...

Author: Huw Davies 
Date:   Tue Jul  8 13:53:51 2014 +0100

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

---

dlls/comctl32/toolbar.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index c90c4bb..a1b7966 100644
--- 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;