[UXTHEME] Fix the conversion from color id to theme metric and don't pass the metric...
authorGiannis Adamopoulos <gadamopoulos@reactos.org>
Sun, 19 Feb 2017 16:32:44 +0000 (16:32 +0000)
committerGiannis Adamopoulos <gadamopoulos@reactos.org>
Sun, 19 Feb 2017 16:32:44 +0000 (16:32 +0000)
svn path=/trunk/; revision=73847

reactos/dll/win32/uxtheme/metric.c

index f2bf936..9889f80 100644 (file)
@@ -61,15 +61,11 @@ COLORREF WINAPI GetThemeSysColor(HTHEME hTheme, int iColorID)
     HRESULT hr;
     PTHEME_PROPERTY tp;
 
-    // TODO: Check if this is correct
-    if ( iColorID >= 0 && iColorID < 32)
-        iColorID += TMT_SCROLLBAR;
-
     TRACE("(%p, %d)\n", hTheme, iColorID);
     SetLastError(0);
     if(hTheme) {
         PTHEME_CLASS ptc = (PTHEME_CLASS) hTheme;
-        if((tp = MSSTYLES_FindMetric(ptc->tf, TMT_COLOR, iColorID))) {
+        if((tp = MSSTYLES_FindMetric(ptc->tf, TMT_COLOR, iColorID + TMT_FIRSTCOLOR))) {
             COLORREF color;
             hr = MSSTYLES_GetPropertyColor(tp, &color);
             if(SUCCEEDED(hr))