Add support for placing the tab bar on the title bar (WinMerge#2428) (5)

Author: sdottaka

Src/Common/MDITabBar.cpp

@@ -90,9 +90,11 @@ static inline COLORREF getTextColor()
 	return GetSysColor(COLOR_WINDOWTEXT);
 }
 
-static COLORREF getBackColor()
+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));
 }
 
@@ -132,7 +134,7 @@ BOOL CMyTabCtrl::OnEraseBkgnd(CDC* pDC)
 {
 	CRect rClient;
 	GetClientRect(rClient);
-	pDC->FillSolidRect(rClient, getBackColor());
+	pDC->FillSolidRect(rClient, getBackColor(m_bOnTitleBar));
 	return TRUE;
 }
 
@@ -357,17 +359,17 @@ void CMyTabCtrl::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct)
 	CRect rc = lpDraw->rcItem;
 	if (lpDraw->itemState & ODS_SELECTED)
 	{
-		const COLORREF clrShadow = CEColor::GetIntermediateColor(GetSysColor(COLOR_3DSHADOW), getBackColor(), 0.5f);
+		const COLORREF clrShadow = CEColor::GetIntermediateColor(GetSysColor(COLOR_3DSHADOW), getBackColor(m_bOnTitleBar), 0.5f);
 		if (GetSysColor(COLOR_3DFACE) == GetSysColor(COLOR_WINDOW))
 		{
 			DrawRoundedRectWithShadow(lpDraw->hDC, rc.left + sw, rc.top + sw - 1, rc.Width() - sw * 2, rc.top - sw * 2 + 2, r, sw,
-				GetSysColor(COLOR_HIGHLIGHT), clrShadow, getBackColor());
+				GetSysColor(COLOR_HIGHLIGHT), clrShadow, getBackColor(m_bOnTitleBar));
 			SetTextColor(lpDraw->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
 		}
 		else
 		{
 			DrawRoundedRectWithShadow(lpDraw->hDC, rc.left + sw, rc.top + sw - 1, rc.Width() - sw * 2, rc.Height() - sw * 2 + 2, r, sw,
-				GetSysColor(COLOR_WINDOW), clrShadow, getBackColor());
+				GetSysColor(COLOR_WINDOW), clrShadow, getBackColor(m_bOnTitleBar));
 			SetTextColor(lpDraw->hDC, getTextColor());
 		}
 	}
@@ -613,6 +615,7 @@ BOOL CMDITabBar::Update(bool bOnTitleBar, bool bMaximized)
 	if (m_bMaximized)
 		AfxGetMainWnd()->GetWindowRect(&rc);
 	m_top = rc.top;
+	m_tabCtrl.SetOnTitleBar(bOnTitleBar);
 	return true;
 }
 
@@ -731,7 +734,7 @@ BOOL CMDITabBar::OnEraseBkgnd(CDC* pDC)
 {
 	CRect rClient;
 	GetClientRect(rClient);
-	pDC->FillSolidRect(rClient, getBackColor());
+	pDC->FillSolidRect(rClient, getBackColor(m_bOnTitleBar));
 	return TRUE;
 }
 
@@ -741,5 +744,5 @@ void CMDITabBar::OnPaint()
 		return __super::OnPaint();
 	CPaintDC dc(this);
 	m_titleBar.DrawIcon(AfxGetMainWnd(), dc);
-	m_titleBar.DrawButtons(dc, getTextColor(), getBackColor());
+	m_titleBar.DrawButtons(dc, getTextColor(), getBackColor(m_bOnTitleBar));
 }

Src/Common/MDITabBar.h

@@ -22,13 +22,15 @@ class CMyTabCtrl : public CTabCtrl
 		, m_nDraggingTabItemIndex(-1)
 		, m_bInSelchange(false)
 		, m_nTooltipTabItemIndex(-1)
+		, m_bOnTitleBar(false)
 	{}
 
 protected:
 	bool m_bInSelchange;
 	bool  m_bAutoMaxWidth;
 	bool m_bMouseTracking;
 	bool m_bCloseButtonDown;
+	bool m_bOnTitleBar;
 	CRect m_rcCurrentCloseButtom;
 	int   m_nDraggingTabItemIndex;
 	int   m_nTooltipTabItemIndex;	/**< Index of the tab displaying tooltip */
@@ -40,6 +42,7 @@ class CMyTabCtrl : public CTabCtrl
 	bool GetAutoMaxWidth() const { return m_bAutoMaxWidth; }
 	void SetAutoMaxWidth(bool bAutoMaxWidth) { m_bAutoMaxWidth = bAutoMaxWidth; }
 	void UpdateTabs();
+	void SetOnTitleBar(bool onTitleBar) { m_bOnTitleBar = onTitleBar; }
 
 // Overrides
 	// ClassWizard generated virtual function overrides