Foreground and background title bars are distinguishable

WinMerge · Oct 27, 2024 · ffed6ce · ffed6ce
1 parent d8d4695
commit ffed6ce
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/Src/Common/MDITabBar.cpp b/Src/Common/MDITabBar.cpp
@@ -9,6 +9,7 @@
 #include "IMDITab.h"
 #include "cecolor.h"
 #include "RoundedRectWithShadow.h"
+#include "MainFrm.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -96,7 +97,10 @@ static COLORREF getBackColor(bool onTitleBar)
 	const COLORREF clr = GetSysColor(COLOR_3DFACE);
 	if (!onTitleBar)
 		return clr;
-	return RGB(GetRValue(clr), std::clamp(GetGValue(clr) + 8, 0, 255), std::clamp(GetBValue(clr) + 8, 0, 255));
+	const COLORREF bgclr = dynamic_cast<CMainFrame*>(AfxGetMainWnd())->IsActivate() ?
+		RGB(GetRValue(clr), std::clamp(GetGValue(clr) + 8, 0, 255), std::clamp(GetBValue(clr) + 8, 0, 255))
+		: clr;
+	return bgclr;
 }
 
 static inline bool IsHighContrastEnabled()

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
@@ -323,7 +323,8 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd)
 	ON_MESSAGE(WMU_CHILDFRAMEACTIVATE, &CMainFrame::OnChildFrameActivate)
 	ON_MESSAGE(WMU_CHILDFRAMEACTIVATED, &CMainFrame::OnChildFrameActivated)
 	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
+		ON_WM_ACTIVATE()
+		END_MESSAGE_MAP()
 
 /**
  * @brief MainFrame statusbar panels/indicators
@@ -366,6 +367,7 @@ CMainFrame::CMainFrame()
 , m_lfDiff(Options::Font::Load(GetOptionsMgr(), OPT_FONT_FILECMP))
 , m_lfDir(Options::Font::Load(GetOptionsMgr(), OPT_FONT_DIRCMP))
 , m_pDirWatcher(new DirWatcher())
+, m_bActivate(false)
 {
 }
 
@@ -3704,3 +3706,19 @@ LRESULT CMainFrame::OnChildFrameActivated(WPARAM wParam, LPARAM lParam)
 
 	return 1;
 }
+
+
+void CMainFrame::OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized)
+{
+	__super::OnActivate(nState, pWndOther, bMinimized);
+
+	const bool bActivate = (nState != WA_INACTIVE);
+	if (bActivate != m_bActivate)
+	{
+		m_bActivate = bActivate;
+
+		CRect titleBarRect;
+		m_wndTabBar.GetClientRect(&titleBarRect);
+		InvalidateRect(&titleBarRect, TRUE);
+	}
+}
diff --git a/Src/MainFrm.h b/Src/MainFrm.h
@@ -228,6 +228,7 @@ class CMainFrame : public CMDIFrameWnd
 	CMenuBar* GetMenuBar() { return &m_wndMenuBar; }
 	CToolBar* GetToolbar() { return &m_wndToolBar; }
 	static void WaitAndDoMessageLoop(bool& completed, int ms);
+	bool IsActivate() const { return m_bActivate; }
 
 // Overrides
 	virtual void GetMessageString(UINT nID, CString& rMessage) const;
@@ -430,6 +431,7 @@ class CMainFrame : public CMDIFrameWnd
 	afx_msg void OnTimer(UINT_PTR nIDEvent);
 	afx_msg void OnDestroy();
 	afx_msg void OnAccelQuit();
+	afx_msg void OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized);
 	afx_msg LRESULT OnChildFrameAdded(WPARAM wParam, LPARAM lParam);
 	afx_msg LRESULT OnChildFrameRemoved(WPARAM wParam, LPARAM lParam);
 	afx_msg LRESULT OnChildFrameActivate(WPARAM wParam, LPARAM lParam);
@@ -454,4 +456,5 @@ class CMainFrame : public CMDIFrameWnd
 	bool CompareFilesIfFilesAreLarge(IDirDoc* pDirDoc, int nFiles, const FileLocation ifileloc[]);
 	std::unique_ptr<WCHAR[]> m_upszLongTextW;
 	std::unique_ptr<CHAR[]> m_upszLongTextA;
+	bool m_bActivate;
 };