[gadamopoulos] 74241: [UXTHEME] -Draw the background glyph inside the content margins. CORE-6000

Author: gadamopoulos
Date: Wed Mar 29 10:01:00 2017
New Revision: 74241

URL: http://svn.reactos.org/svn/reactos?rev=74241&view=rev
Log:
[UXTHEME] -Draw the background glyph inside the content margins. CORE-6000

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?re...
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/draw.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/draw.c	[iso-8859-1] Wed Mar 29 10:01:00 2017
@@ -1051,7 +1051,19 @@
         hr = E_FAIL;
     }
     if(SUCCEEDED(hr))
-        hr = UXTHEME_DrawGlyph(hTheme, hdc, iPartId, iStateId, &rt, opts);
+    {
+        RECT rcGlyph = *pRect;
+        MARGINS margin;
+        hr = GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_CONTENTMARGINS, NULL, &margin);
+        if(SUCCEEDED(hr))
+        {
+            rcGlyph.left += margin.cxLeftWidth;
+            rcGlyph.right -= margin.cxRightWidth;
+            rcGlyph.top += margin.cyTopHeight;
+            rcGlyph.bottom -= margin.cyBottomHeight;
+        }
+        hr = UXTHEME_DrawGlyph(hTheme, hdc, iPartId, iStateId, &rcGlyph, opts);
+    }
     if(opts->dwFlags & DTBG_CLIPRECT) {
         if(hasClip == 0)
             SelectClipRgn(hdc, NULL);