comctl32: Don't use the RECT from the custom draw structure when referring to the button alone.
This commit is contained in:
parent
2a12c6a7d4
commit
d130ba09fa
|
@ -748,10 +748,10 @@ TOOLBAR_DrawImage(const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, INT left, I
|
||||||
|
|
||||||
/* draws a blank frame for a toolbar button */
|
/* draws a blank frame for a toolbar button */
|
||||||
static void
|
static void
|
||||||
TOOLBAR_DrawFrame(const TOOLBAR_INFO *infoPtr, const NMTBCUSTOMDRAW *tbcd, DWORD dwItemCDFlag)
|
TOOLBAR_DrawFrame(const TOOLBAR_INFO *infoPtr, const NMTBCUSTOMDRAW *tbcd, const RECT *rect, DWORD dwItemCDFlag)
|
||||||
{
|
{
|
||||||
HDC hdc = tbcd->nmcd.hdc;
|
HDC hdc = tbcd->nmcd.hdc;
|
||||||
RECT rc = tbcd->nmcd.rc;
|
RECT rc = *rect;
|
||||||
/* if the state is disabled or indeterminate then the button
|
/* if the state is disabled or indeterminate then the button
|
||||||
* cannot have an interactive look like pressed or hot */
|
* cannot have an interactive look like pressed or hot */
|
||||||
BOOL non_interactive_state = (tbcd->nmcd.uItemState & CDIS_DISABLED) ||
|
BOOL non_interactive_state = (tbcd->nmcd.uItemState & CDIS_DISABLED) ||
|
||||||
|
@ -1021,10 +1021,10 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc,
|
||||||
|| (drawSepDropDownArrow && btnPtr->bDropDownPressed))
|
|| (drawSepDropDownArrow && btnPtr->bDropDownPressed))
|
||||||
stateId = TS_HOT;
|
stateId = TS_HOT;
|
||||||
|
|
||||||
DrawThemeBackground (theme, hdc, partId, stateId, &tbcd.nmcd.rc, NULL);
|
DrawThemeBackground (theme, hdc, partId, stateId, &rc, NULL);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
TOOLBAR_DrawFrame(infoPtr, &tbcd, dwItemCDFlag);
|
TOOLBAR_DrawFrame(infoPtr, &tbcd, &rc, dwItemCDFlag);
|
||||||
|
|
||||||
if (drawSepDropDownArrow)
|
if (drawSepDropDownArrow)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue