From 9e7f83598971278c447b987bb89eade9ca6d12c2 Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Sat, 29 Jul 2017 08:52:04 +0000 Subject: [PATCH] [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. svn path=/trunk/; revision=75437 --- reactos/dll/win32/comctl32/toolbar.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/reactos/dll/win32/comctl32/toolbar.c b/reactos/dll/win32/comctl32/toolbar.c index eeb805b92bd..2c7d8bd749e 100644 --- a/reactos/dll/win32/comctl32/toolbar.c +++ b/reactos/dll/win32/comctl32/toolbar.c @@ -1019,6 +1019,9 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, 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, -- 2.17.1