System Icon turn gray when app inactive

WinMerge · Nov 18, 2024 · fa6650d · fa6650d
1 parent 861ee28
commit fa6650d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/Src/Common/MDITabBar.cpp b/Src/Common/MDITabBar.cpp
@@ -769,6 +769,6 @@ void CMDITabBar::OnPaint()
 	if (!m_bOnTitleBar)
 		return __super::OnPaint();
 	CPaintDC dc(this);
-	m_titleBar.DrawIcon(AfxGetMainWnd(), dc);
+	m_titleBar.DrawIcon(AfxGetMainWnd(), dc, m_tabCtrl.GetActive());
 	m_titleBar.DrawButtons(dc, CTitleBarHelper::GetTextColor(m_tabCtrl.GetActive()), m_tabCtrl.GetBackColor());
 }
diff --git a/Src/Merge2.rc b/Src/Merge2.rc
@@ -12,6 +12,7 @@
 // remains consistent on all systems.
 
 IDR_MAINFRAME           ICON                    "res\\Merge.ico"
+IDR_MAINFRAME_ICON_GRAY ICON                    "res\\Merge_gray.ico"
 IDR_MERGEPROJECT        ICON                    "res\\MergeProject.ico"
 IDR_MERGEDOCTYPE        ICON                    "res\\MergeDoc.ico"
 IDR_DIRDOCTYPE          ICON                    "res\\MergeDir.ico"

diff --git a/Src/TitleBarHelper.cpp b/Src/TitleBarHelper.cpp
@@ -29,18 +29,18 @@ CTitleBarHelper::CTitleBarHelper()
 void CTitleBarHelper::Init(CWnd *pWnd)
 {
 	m_pWnd = pWnd;
+	m_icon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+	m_icon_gray = AfxGetApp()->LoadIcon(IDR_MAINFRAME_ICON_GRAY);
 }
 
 int CTitleBarHelper::GetTopMargin() const
 {
 	return 0;
 }
 
-void CTitleBarHelper::DrawIcon(CWnd* pWnd, CDC& dc)
+void CTitleBarHelper::DrawIcon(CWnd* pWnd, CDC& dc, bool active)
 {
-	HICON hIcon = (HICON)pWnd->SendMessage(WM_GETICON, ICON_SMALL2, 0);
-	if (hIcon == nullptr)
-		hIcon = (HICON)GetClassLongPtr(pWnd->m_hWnd, GCLP_HICONSM);
+	HICON hIcon = active ? m_icon : m_icon_gray;
 	if (hIcon == nullptr)
 		return;
 	const int topMargin = GetTopMargin();

diff --git a/Src/TitleBarHelper.h b/Src/TitleBarHelper.h
@@ -14,7 +14,7 @@ class CTitleBarHelper {
 public:
 	CTitleBarHelper();
 	void Init(CWnd* pWnd);
-	void DrawIcon(CWnd* pWnd, CDC& dc);
+	void DrawIcon(CWnd* pWnd, CDC& dc, bool active);
 	void DrawButtons(CDC& dc, COLORREF textColor, COLORREF backColor);
 	int GetTopMargin() const;
 	int GetLeftMargin() const { return PointToPixel(m_leftMargin); }
@@ -51,4 +51,6 @@ class CTitleBarHelper {
 	unsigned m_nHitTest;
 	float m_leftMargin;
 	float m_rightMargin;
+	HICON m_icon;
+	HICON m_icon_gray;
 };
diff --git a/Src/res/Merge_gray.ico b/Src/res/Merge_gray.ico
diff --git a/Src/resource.h b/Src/resource.h
@@ -30,6 +30,7 @@
 #define IDR_POPUP_PLUGIN_COMMAND_LINE_MENU 126
 #define IDR_POPUP_PLUGIN_ADD_MENU       127
 #define IDR_POPUP_DIRVIEW_COMPAREMETHOD 128
+#define IDR_MAINFRAME_ICON_GRAY         129
 #define IDD_ABOUTBOX                    200
 #define IDD_OPEN                        202
 #define IDD_SAVECLOSING                 203