Add a dark theme for the Options dialog

Makes the Options property sheet (the "O" dialog) follow the dark look of
the rest of the player instead of always rendering in the light system
style. It covers the whole dialog: the navigation tree, the property pages,
group boxes, edits/combos, list controls, spin buttons, sliders, tab
headers, checkboxes and the scrollbars (flat, drawn through the bundled
CoolSB, matching the playlist). The sheet also re-themes live when the
setting is toggled while it is open.

Everything is gated on the existing "Use the 'dark' theme" setting
(bUseDarkTheme) and reuses the existing ThemeRGB() palette, so when the
flag is off every control falls back to its original light appearance and
there is no behavioural change.

A new helper (controls/DarkTheme.*) centralises the theming so most of the
~26 pages are covered from CPPageBase / CPPageSheet. Small, flag-gated
tweaks are made to the bundled coolsb (expose one global as extern so the
header can be included from more than one TU) and to the TreePropSheet
page frame (dark caption/background colours).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: kcinickgx

src/ExtLib/ui/TreePropSheet/PropPageFrameDefault.cpp

@@ -175,6 +175,12 @@ BEGIN_MESSAGE_MAP(CPropPageFrameDefault, CWnd)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
+// <MPC-BE Custom Code>
+bool     CPropPageFrameDefault::s_bDarkMode = false;
+COLORREF CPropPageFrameDefault::s_clrFace   = RGB(37, 42, 47);
+COLORREF CPropPageFrameDefault::s_clrText   = RGB(179, 184, 189);
+// </MPC-BE Custom Code>
+
 
 CPropPageFrameDefault::CPropPageFrameDefault()
 {
@@ -299,9 +305,22 @@ CRect CPropPageFrameDefault::CalcCaptionArea()
 void CPropPageFrameDefault::DrawCaption(CDC *pDc, CRect rect, LPCTSTR lpszCaption, HICON hIcon)
 {
 	// <MPC-BE Custom Code>
-	COLORREF	clrLeft = GetSysColor(COLOR_ACTIVECAPTION);
+	auto Lighten = [](COLORREF c, int d) -> COLORREF {
+		int r = GetRValue(c) + d; if (r > 255) { r = 255; }
+		int g = GetGValue(c) + d; if (g > 255) { g = 255; }
+		int b = GetBValue(c) + d; if (b > 255) { b = 255; }
+		return RGB(r, g, b);
+	};
+
+	COLORREF	clrLeft;
+	COLORREF	clrRight;
+	if (s_bDarkMode) {
+		clrLeft = clrRight = Lighten(s_clrFace, 14); // subtle header band above the page
+	} else {
+		clrLeft = GetSysColor(COLOR_ACTIVECAPTION);
+		clrRight = pDc->GetPixel(rect.right-1, rect.top);
+	}
 	// </MPC-BE Custom Code>
-	COLORREF	clrRight = pDc->GetPixel(rect.right-1, rect.top);
 	FillGradientRectH(pDc, rect, clrLeft, clrRight);
 
 	// draw icon
@@ -317,7 +336,7 @@ void CPropPageFrameDefault::DrawCaption(CDC *pDc, CRect rect, LPCTSTR lpszCaptio
 	// draw text
 	rect.left += 2;
 
-	COLORREF	clrPrev = pDc->SetTextColor(GetSysColor(COLOR_CAPTIONTEXT));
+	COLORREF	clrPrev = pDc->SetTextColor(s_bDarkMode ? s_clrText : GetSysColor(COLOR_CAPTIONTEXT));
 	int				nBkStyle = pDc->SetBkMode(TRANSPARENT);
 	CFont			*pFont = (CFont*)pDc->SelectStockObject(SYSTEM_FONT);
 
@@ -405,6 +424,15 @@ void CPropPageFrameDefault::OnPaint()
 
 BOOL CPropPageFrameDefault::OnEraseBkgnd(CDC* pDC)
 {
+	// <MPC-BE Custom Code>
+	if (s_bDarkMode) {
+		CRect rect;
+		GetClientRect(rect);
+		pDC->FillSolidRect(rect, s_clrFace);
+		return TRUE;
+	}
+	// </MPC-BE Custom Code>
+
 	if (g_ThemeLib.IsAvailable() && g_ThemeLib.IsThemeActive())
 	{
 		HTHEME	hTheme = g_ThemeLib.OpenThemeData(m_hWnd, L"Tab");

src/ExtLib/ui/TreePropSheet/PropPageFrameDefault.h

@@ -46,6 +46,15 @@ class /*AFX_EXT_CLASS*/ CPropPageFrameDefault : public CWnd,
 	CPropPageFrameDefault();
 	virtual ~CPropPageFrameDefault();
 
+// <MPC-BE Custom Code>
+// Dark theme palette, set by the host (CPPageSheet) before the frame paints.
+// When s_bDarkMode is false the classic (system-colored) appearance is used.
+public:
+	static bool     s_bDarkMode;
+	static COLORREF s_clrFace;
+	static COLORREF s_clrText;
+// </MPC-BE Custom Code>
+
 // operations
 public:
 

src/ExtLib/ui/coolsb/coolsblib.c

@@ -37,6 +37,10 @@
 
 static TCHAR szPropStr[] = _T("CoolSBSubclassPtr");
 
+// Single definition of the theme-colour callback (declared extern in coolscroll.h so the
+// header can be included from more than one translation unit without a duplicate symbol).
+ptr_themeRGB fThemeRGB = NULL;
+
 LRESULT CALLBACK CoolSBWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
 
 SCROLLWND *GetScrollWndFromHwnd(HWND hwnd)

src/ExtLib/ui/coolsb/coolscroll.h

@@ -143,7 +143,7 @@ int  WINAPI CoolSB_SetScrollPos	(HWND hwnd, int nBar, int nPos, BOOL fRedraw);
 int  WINAPI CoolSB_SetScrollRange	(HWND hwnd, int nBar, int nMinPos, int nMaxPos, BOOL fRedraw);
 BOOL WINAPI CoolSB_ShowScrollBar	(HWND hwnd, int wBar, BOOL fShow);
 
-ptr_themeRGB fThemeRGB;
+extern ptr_themeRGB fThemeRGB;
 
 //
 // Scrollbar dimension functions

src/apps/mplayerc/PPageAccelTbl.cpp

@@ -21,6 +21,7 @@
 
 #include "stdafx.h"
 #include "PPageAccelTbl.h"
+#include "controls/DarkTheme.h"
 
 //#define MASK_NUMBER  0xFFF
 #define DUP_KEY      (1<<12)
@@ -839,11 +840,20 @@ void CPPageAccelTbl::OnCustomdrawList( NMHDR* pNMHDR, LRESULT* pResult )
 		auto itemData = (ITEMDATA*)m_list.GetItemData(pLVCD->nmcd.dwItemSpec);
 		auto dup = itemData->flag;
 
-		if (pLVCD->iSubItem == COL_CMD && dup
+		const bool isDup = (pLVCD->iSubItem == COL_CMD && dup
 				|| pLVCD->iSubItem == COL_KEY && (dup & DUP_KEY)
 				|| pLVCD->iSubItem == COL_APPCMD && (dup & DUP_APPCMD)
-				|| pLVCD->iSubItem == COL_RMCMD && (dup & DUP_RMCMD)) {
+				|| pLVCD->iSubItem == COL_RMCMD && (dup & DUP_RMCMD));
+
+		if (isDup) {
 			pLVCD->clrTextBk = RGB(255, 130, 120);
+			if (DarkTheme::IsActive()) {
+				pLVCD->clrText = RGB(0, 0, 0); // keep the text readable on the highlight
+			}
+		}
+		else if (DarkTheme::IsActive()) {
+			pLVCD->clrTextBk = DarkTheme::FaceColor();
+			pLVCD->clrText   = DarkTheme::TextColor();
 		}
 		else {
 			pLVCD->clrTextBk = GetSysColor(COLOR_WINDOW);

src/apps/mplayerc/PPageBase.cpp

@@ -22,6 +22,7 @@
 #include "stdafx.h"
 #include "MainFrm.h"
 #include "PPageBase.h"
+#include "controls/DarkTheme.h"
 
 // CPPageBase dialog
 
@@ -79,6 +80,9 @@ BOOL CPPageBase::PreTranslateMessage(MSG* pMsg)
 
 BEGIN_MESSAGE_MAP(CPPageBase, CCmdUIPropertyPage)
 	ON_WM_DESTROY()
+	ON_WM_CTLCOLOR()
+	ON_WM_ERASEBKGND()
+	ON_WM_DRAWITEM()
 END_MESSAGE_MAP()
 
 // CPPageBase message handlers
@@ -87,7 +91,84 @@ BOOL CPPageBase::OnSetActive()
 {
 	AfxGetAppSettings().nLastUsedPage = (UINT)(ULONG_PTR)m_pPSP->pszTemplate;
 
-	return __super::OnSetActive();
+	BOOL bRet = __super::OnSetActive();
+
+	// Re-apply the dark visual style on every activation. It is idempotent (controls
+	// already themed are skipped), and doing it each time avoids a race on the page
+	// shown first, whose controls may not have been ready the very first time.
+	DarkTheme::ApplyThemeToChildren(GetSafeHwnd());
+
+	return bRet;
+}
+
+HBRUSH CPPageBase::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
+{
+	HBRUSH hbr = __super::OnCtlColor(pDC, pWnd, nCtlColor);
+
+	if (HBRUSH hbrDark = DarkTheme::OnCtlColor(pDC, nCtlColor)) {
+		return hbrDark;
+	}
+
+	return hbr;
+}
+
+BOOL CPPageBase::OnEraseBkgnd(CDC* pDC)
+{
+	if (DarkTheme::IsActive()) {
+		CRect rc;
+		GetClientRect(rc);
+		pDC->FillSolidRect(rc, DarkTheme::FaceColor());
+		return TRUE;
+	}
+
+	return __super::OnEraseBkgnd(pDC);
+}
+
+// The horizontal separator lines in the option pages are owner-drawn statics
+// (SS_OWNERDRAW) so Windows does not paint its light 3D etched line. We draw them
+// here: a flat line in the shared border colour when the dark theme is active, or
+// the classic etched edge otherwise.
+void CPPageBase::OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct)
+{
+	if (lpDrawItemStruct && lpDrawItemStruct->CtlType == ODT_STATIC) {
+		CDC* pDC = CDC::FromHandle(lpDrawItemStruct->hDC);
+		CRect rc(lpDrawItemStruct->rcItem);
+		if (DarkTheme::IsActive()) {
+			pDC->FillSolidRect(rc, DarkTheme::FaceColor());
+			pDC->FillSolidRect(rc.left, rc.top + rc.Height() / 2, rc.Width(), 1, DarkTheme::CtrlBorderColor());
+		} else {
+			pDC->FillSolidRect(rc, GetSysColor(COLOR_3DFACE));
+			::DrawEdge(lpDrawItemStruct->hDC, &rc, EDGE_ETCHED, BF_TOP);
+		}
+		return;
+	}
+
+	__super::OnDrawItem(nIDCtl, lpDrawItemStruct);
+}
+
+BOOL CPPageBase::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
+{
+	// For NM_CUSTOMDRAW, let any page-specific handler run first (e.g. colour-picker
+	// buttons that paint themselves with the selected colour, or list controls). Only
+	// when the page does not handle it do we apply the generic dark theming for the
+	// controls native dark mode leaves light: trackbar (slider) channels, checkbox/
+	// radio-button captions and push buttons. (Group boxes are handled by subclassing,
+	// since they emit no NM_CUSTOMDRAW.)
+	NMHDR* pNMHDR = reinterpret_cast<NMHDR*>(lParam);
+	if (pNMHDR && pNMHDR->code == NM_CUSTOMDRAW) {
+		if (__super::OnNotify(wParam, lParam, pResult)) {
+			return TRUE;
+		}
+		if (DarkTheme::TrackbarCustomDraw(pNMHDR, pResult)) {
+			return TRUE;
+		}
+		if (DarkTheme::ButtonCustomDraw(pNMHDR, pResult)) {
+			return TRUE;
+		}
+		return FALSE;
+	}
+
+	return __super::OnNotify(wParam, lParam, pResult);
 }
 
 void CPPageBase::OnDestroy()

src/apps/mplayerc/PPageBase.h

@@ -34,6 +34,9 @@ class CPPageBase : public CCmdUIPropertyPage
 	CToolTipCtrl m_wndToolTip;
 	void CreateToolTip();
 
+	// dark theme: apply the dark visual style to child controls once, on first activation
+	bool m_bDarkThemeApplied = false;
+
 public:
 	CPPageBase(UINT nIDTemplate, UINT nIDCaption = 0);
 	virtual ~CPPageBase();
@@ -43,11 +46,15 @@ class CPPageBase : public CCmdUIPropertyPage
 	virtual BOOL PreTranslateMessage(MSG* pMsg);
 	virtual BOOL OnSetActive();
 	virtual BOOL OnApply();
+	virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
 
 	int ScaleY(int y);
 
 	DECLARE_MESSAGE_MAP()
 
 public:
 	afx_msg void OnDestroy();
+	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
+	afx_msg BOOL OnEraseBkgnd(CDC* pDC);
+	afx_msg void OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct);
 };

src/apps/mplayerc/PPageExternalFilters.h

@@ -23,6 +23,7 @@
 
 #include "PPageBase.h"
 #include "controls/FloatEdit.h"
+#include "controls/DarkCheckListBox.h"
 
 bool IsSupportedExternalVideoRenderer(CLSID clsid);
 
@@ -46,7 +47,7 @@ class CPPageExternalFilters : public CPPageBase
 
 	enum { IDD = IDD_PPAGEEXTERNALFILTERS };
 
-	CCheckListBox m_filters;
+	CDarkCheckListBox m_filters;
 	int m_iLoadType = FilterOverride::PREFERRED;
 	CHexEdit m_dwMerit;
 	CTreeCtrl m_tree;