Author: akhaldi
Date: Tue Sep 8 12:47:33 2015
New Revision: 69116
URL:
http://svn.reactos.org/svn/reactos?rev=69116&view=rev
Log:
[UXTHEME] Revert Wine Commit 2b650fa as it breaks themed Explorer Toolbar Separators.
CORE-9636 and Wine Bug #38538.
Modified:
trunk/reactos/dll/win32/uxtheme/draw.c
Modified: trunk/reactos/dll/win32/uxtheme/draw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Tue Sep 8 12:47:33 2015
@@ -714,6 +714,9 @@
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 @@
rcSrc.right = srcSize.x;
rcSrc.bottom = srcSize.y;
}
+#endif
hdcDst = hdc;
OffsetViewportOrgEx(hdcDst, rcDst.left, rcDst.top, &org);