Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[UXTHEME] Revert Wine Commit 2b650fa as it breaks themed Explorer Toolbar Separators. CORE-9636 and Wine Bug #38538.

Browse source 
svn path=/trunk/; revision=69116
This commit is contained in:
Amine Khaldi 2015-09-08 12:47:33 +00:00
parent 0e27d88871
commit f8c7c7fd5e
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/uxtheme/draw.c
View file

@ -714,6 +714,9 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId,
GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_SIZINGMARGINS, NULL, &sm); GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_SIZINGMARGINS, NULL, &sm);
/* Resize source image if destination smaller than margins */ /* 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.cxLeftWidth + sm.cxRightWidth > dstSize.x) {
if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y) { if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y) {
sm.cyTopHeight = MulDiv(sm.cyTopHeight, dstSize.y, srcSize.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.right = srcSize.x;
rcSrc.bottom = srcSize.y; rcSrc.bottom = srcSize.y;
} }
#endif
hdcDst = hdc; hdcDst = hdc;
OffsetViewportOrgEx(hdcDst, rcDst.left, rcDst.top, &org); OffsetViewportOrgEx(hdcDst, rcDst.left, rcDst.top, &org);