From 5be44d619b49477f84a005b5567bd9cc15f396bf Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sun, 9 Aug 2020 21:07:58 +0000
Subject: [PATCH] Draw the header icon background correctly

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7211 212acab6-be3b-0410-9dea-997c60f758d6
---
 Examples/NSISMenu.nsi | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Examples/NSISMenu.nsi b/Examples/NSISMenu.nsi
index ffa44302..e9ecd230 100644
--- a/Examples/NSISMenu.nsi
+++ b/Examples/NSISMenu.nsi
@@ -155,10 +155,14 @@ nsDialogs::CreateControl ${__NSD_Label_CLASS} ${__NSD_Label_STYLE} ${__NSD_Label
 Pop $0
 ${SetCtlColors} $0 0xffffff 0xffffff ${CB_HEADER}
 
-nsDialogs::CreateControl ${__NSD_Icon_CLASS} ${__NSD_Icon_STYLE}|${SS_CENTERIMAGE}|${SS_CENTER} ${__NSD_Icon_EXSTYLE} 0 0 33u ${UY_HEADER}u ""
+; CCv5 does not paint the background outside of the icon correctly when SS_CENTERIMAGE is used so we have to overlay a small icon on top of the background
+nsDialogs::CreateControl ${__NSD_Icon_CLASS} ${__NSD_Icon_STYLE} ${__NSD_Icon_EXSTYLE} 4u 4u 33u ${UY_HEADER}u ""
 Pop $0
 ${SetCtlColors} $0 "" "" ${CB_HEADER}
 ${NSD_SetIconFromInstaller} $0 $1
+nsDialogs::CreateControl ${__NSD_Icon_CLASS} ${__NSD_Icon_STYLE}|${SS_CENTERIMAGE}|${SS_CENTER} ${__NSD_Icon_EXSTYLE} 0 0 33u ${UY_HEADER}u ""
+Pop $0
+${SetCtlColors} $0 "" "" ${CB_HEADER}
 
 CreateFont $1 "Trebuchet MS" 17
 !searchreplace VERSTR "${NSIS_VERSION}" "v" ""