Fix dark theme toolbar buttons not showing when added for the first time
@@ -2017,7 +2017,7 @@ LRESULT CALLBACK PhThemeWindowDrawToolbar(
SelectFont(DrawInfo->nmcd.hdc, GetWindowFont(DrawInfo->nmcd.hdr.hwndFrom));
- if (buttonInfo.iImage != INT_ERROR)
+ if (buttonInfo.iImage != I_IMAGECALLBACK)
{
HIMAGELIST toolbarImageList;
@@ -2056,6 +2056,10 @@ LRESULT CALLBACK PhThemeWindowDrawToolbar(
);
}
}
+ else
+ {
+ return CDRF_DODEFAULT; // Required for I_IMAGECALLBACK (dmex)
+ }
if (buttonInfo.fsStyle & BTNS_SHOWTEXT)
{
