Author: gadamopoulos Date: Sat Jul 29 08:52:04 2017 New Revision: 75437 URL: http://svn.reactos.org/svn/reactos?rev=75437&view=rev Log: [COMCTL32] -Take into account the upper theme margin when drawing the icon so that it doesn't look misplaced. This makes the themed taskbar buttons look more or less good despite the fact that we completely ignore the left and right margins.
Modified: trunk/reactos/dll/win32/comctl32/toolbar.c Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar.c?rev=75437&r1=75436&r2=75437&view=diff ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sat Jul 29 08:52:04 2017 @@ -1019,6 +1019,9 @@ rcBitmap.left += ((rc.right - rc.left) - infoPtr->nBitmapWidth) / 2; rcBitmap.top += infoPtr->szPadding.cy / 2; +#ifdef __REACTOS__ + rcBitmap.top += infoPtr->themeMargins.cyTopHeight; +#endif TRACE("iBitmap=%d, start=(%d,%d) w=%d, h=%d\n", btnPtr->iBitmap, rcBitmap.left, rcBitmap.top,