Theme: Display disabled toolbar buttons in greyscale if theme is enabled (winsiderss#1104)

Author: TheEragon

ProcessHacker/procprv.c

@@ -3341,7 +3341,8 @@ VOID PhDrawProcessIcon(
                 hdc,
                 rect.left,
                 rect.top,
-                ILD_NORMAL | ILD_TRANSPARENT
+                ILD_NORMAL | ILD_TRANSPARENT,
+                FALSE
                 );
         }
     }
@@ -3355,7 +3356,8 @@ VOID PhDrawProcessIcon(
                 hdc,
                 rect.left,
                 rect.top,
-                ILD_NORMAL | ILD_TRANSPARENT
+                ILD_NORMAL | ILD_TRANSPARENT,
+                FALSE
                 );
         }
     }

ProcessHacker/runas.c

@@ -2892,7 +2892,8 @@ INT_PTR CALLBACK PhpRunFileWndProc(
                                         customDraw->hdc,
                                         customDraw->rc.left,
                                         customDraw->rc.top + 1, // offset
-                                        ILD_TRANSPARENT
+                                        ILD_TRANSPARENT,
+                                        FALSE
                                         );
 
                                     SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, CDRF_SKIPDEFAULT);

ProcessHacker/searchbox.c

@@ -326,7 +326,8 @@ VOID PhpSearchDrawButton(
             Hdc,
             ButtonRect.left + 1, // offset
             ButtonRect.top,
-            ILD_TRANSPARENT
+            ILD_TRANSPARENT,
+            FALSE
             );
     }
     else
@@ -337,7 +338,8 @@ VOID PhpSearchDrawButton(
             Hdc,
             ButtonRect.left + 2, // offset
             ButtonRect.top + 1, // offset
-            ILD_TRANSPARENT
+            ILD_TRANSPARENT,
+            FALSE
             );
     }
 }

phlib/guisup.c

@@ -2377,7 +2377,8 @@ BOOLEAN PhImageListDrawIcon(
     _In_ HDC Hdc,
     _In_ INT x,
     _In_ INT y,
-    _In_ UINT Style
+    _In_ UINT Style,
+    _In_ BOOLEAN Disabled
     )
 {
     return PhImageListDrawEx(
@@ -2390,7 +2391,8 @@ BOOLEAN PhImageListDrawIcon(
         0,
         CLR_DEFAULT,
         CLR_DEFAULT,
-        Style
+        Style,
+        Disabled ? ILS_SATURATE : ILS_NORMAL
         );
 }
 
@@ -2404,7 +2406,8 @@ BOOLEAN PhImageListDrawEx(
     _In_ INT dy,
     _In_ COLORREF BackColor,
     _In_ COLORREF ForeColor,
-    _In_ UINT Style
+    _In_ UINT Style,
+    _In_ DWORD State
     )
 {
     IMAGELISTDRAWPARAMS imagelistDraw;
@@ -2421,6 +2424,7 @@ BOOLEAN PhImageListDrawEx(
     imagelistDraw.rgbBk = BackColor;
     imagelistDraw.rgbFg = ForeColor;
     imagelistDraw.fStyle = Style;
+    imagelistDraw.fState = State;
 
     return SUCCEEDED(IImageList2_Draw((IImageList2*)ImageListHandle, &imagelistDraw));
 }

phlib/include/guisup.h

@@ -1061,7 +1061,8 @@ PhImageListDrawIcon(
     _In_ HDC Hdc,
     _In_ INT x,
     _In_ INT y,
-    _In_ UINT Style
+    _In_ UINT Style,
+    _In_ BOOLEAN Disabled
     );
 
 PHLIBAPI
@@ -1077,7 +1078,8 @@ PhImageListDrawEx(
     _In_ INT dy,
     _In_ COLORREF BackColor,
     _In_ COLORREF ForeColor,
-    _In_ UINT Style
+    _In_ UINT Style,
+    _In_ DWORD State
     );
 
 #define PH_DRAW_TIMELINE_OVERFLOW 0x1

phlib/theme.c

@@ -1752,6 +1752,12 @@ LRESULT CALLBACK PhThemeWindowDrawToolbar(
                 DrawInfo->nmcd.dwItemSpec,
                 0
                 ) == 0;
+            BOOLEAN isEnabled = SendMessage(
+                DrawInfo->nmcd.hdr.hwndFrom,
+                TB_ISBUTTONENABLED,
+                DrawInfo->nmcd.dwItemSpec,
+                0
+                ) != 0;
 
             if (SendMessage(
                 DrawInfo->nmcd.hdr.hwndFrom,
@@ -1878,7 +1884,8 @@ LRESULT CALLBACK PhThemeWindowDrawToolbar(
                         DrawInfo->nmcd.hdc,
                         x,
                         y,
-                        ILD_NORMAL
+                        ILD_NORMAL,
+                        !isEnabled
                         );
                 }
             }

phlib/treenew.c

@@ -5704,7 +5704,8 @@ VOID PhTnpDrawCell(
                 SmallIconHeight,
                 CLR_DEFAULT,
                 CLR_NONE,
-                ILD_NORMAL | ILD_TRANSPARENT
+                ILD_NORMAL | ILD_TRANSPARENT,
+                ILS_NORMAL
                 );
 
             textRect.left += SmallIconWidth + TNP_ICON_RIGHT_PADDING;

tools/peview/searchbox.c

@@ -495,7 +495,8 @@ VOID PhpSearchDrawButton(
             Hdc,
             ButtonRect.left + 1, // offset
             ButtonRect.top,
-            ILD_TRANSPARENT
+            ILD_TRANSPARENT,
+            FALSE
             );
     }
     else
@@ -506,7 +507,8 @@ VOID PhpSearchDrawButton(
             Hdc,
             ButtonRect.left + 2, // offset
             ButtonRect.top + 1, // offset
-            ILD_TRANSPARENT
+            ILD_TRANSPARENT,
+            FALSE
             );
     }
 }