From f8c7c7fd5e7baefbe0951256ec0a1d42ef882cb2 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 8 Sep 2015 12:47:33 +0000 Subject: [PATCH] [UXTHEME] Revert Wine Commit 2b650fa as it breaks themed Explorer Toolbar Separators. CORE-9636 and Wine Bug #38538. svn path=/trunk/; revision=69116 --- reactos/dll/win32/uxtheme/draw.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/reactos/dll/win32/uxtheme/draw.c b/reactos/dll/win32/uxtheme/draw.c index cc178c14b88..ab005fc5628 100644 --- a/reactos/dll/win32/uxtheme/draw.c +++ b/reactos/dll/win32/uxtheme/draw.c @@ -714,6 +714,9 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_SIZINGMARGINS, NULL, &sm); /* Resize source image if destination smaller than margins */ +#ifndef __REACTOS__ + /* Revert Wine Commit 2b650fa as it breaks themed Explorer Toolbar Separators + FIXME: Revisit this when the bug is fixed. CORE-9636 and Wine Bug #38538 */ if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y || sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y) { sm.cyTopHeight = MulDiv(sm.cyTopHeight, dstSize.y, srcSize.y); @@ -740,6 +743,7 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, rcSrc.right = srcSize.x; rcSrc.bottom = srcSize.y; } +#endif hdcDst = hdc; OffsetViewportOrgEx(hdcDst, rcDst.left, rcDst.top, &org);