Add a dark theme for the Options dialog

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/ExtLib/ui/sizecbar/scbarg.cpp

@@ -116,36 +116,36 @@ void CSizingControlBarG::NcPaintGripper(CDC* pDC, CRect rcClient)
     if (!HasGripper())
         return;
 
-    if (!m_bUseDarkTheme) {
-        // paints a simple "two raised lines" gripper
-        // override this if you want a more sophisticated gripper
-        CRect gripper = rcClient;
-        CRect rcbtn = m_biHide.GetRect(CSize(ScaleX(m_cyGripper), ScaleY(m_cyGripper)));
-        BOOL bHorz = IsHorzDocked();
-
-        gripper.DeflateRect(1, 1);
-        const auto sizeX = ScaleX(m_cyGripper) / 4;
-        const auto sizeY = ScaleY(m_cyGripper) / 4;
-        if (bHorz)
-        {   // gripper at left
-            gripper.left -= (ScaleX(m_cyGripper) / 2 + sizeX * 2);
-            gripper.right = gripper.left + sizeX;
-            gripper.top = rcbtn.bottom + 3;
-        }
-        else
-        {   // gripper at top
-            gripper.top -= (ScaleY(m_cyGripper) / 2 + sizeY * 2);
-            gripper.bottom = gripper.top + sizeY;
-            gripper.right = rcbtn.left - 3;
-        }
-        pDC->Draw3dRect(gripper, ::GetSysColor(COLOR_BTNHIGHLIGHT),
-            ::GetSysColor(COLOR_BTNSHADOW));
+    // paints a simple "two raised lines" gripper
+    // override this if you want a more sophisticated gripper
+    CRect gripper = rcClient;
+    CRect rcbtn = m_biHide.GetRect(CSize(ScaleX(m_cyGripper), ScaleY(m_cyGripper)));
+    BOOL bHorz = IsHorzDocked();
+
+    gripper.DeflateRect(1, 1);
+    const auto sizeX = ScaleX(m_cyGripper) / 4;
+    const auto sizeY = ScaleY(m_cyGripper) / 4;
+    if (bHorz)
+    {   // gripper at left
+        gripper.left -= (ScaleX(m_cyGripper) / 2 + sizeX * 2);
+        gripper.right = gripper.left + sizeX;
+        gripper.top = rcbtn.bottom + 3;
+    }
+    else
+    {   // gripper at top
+        gripper.top -= (ScaleY(m_cyGripper) / 2 + sizeY * 2);
+        gripper.bottom = gripper.top + sizeY;
+        gripper.right = rcbtn.left - 3;
+    }
 
-        gripper.OffsetRect(bHorz ? sizeX : 0, bHorz ? 0 : sizeY);
+    // In the dark theme the system 3D colours are near-black on the dark frame (the gripper lines
+    // vanished); use themed light/dark greys so the two raised lines stay visible.
+    const COLORREF clrHi = m_bUseDarkTheme ? ColorThemeRGB(95, 100, 105) : ::GetSysColor(COLOR_BTNHIGHLIGHT);
+    const COLORREF clrLo = m_bUseDarkTheme ? ColorThemeRGB(20, 25, 30)   : ::GetSysColor(COLOR_BTNSHADOW);
 
-        pDC->Draw3dRect(gripper, ::GetSysColor(COLOR_BTNHIGHLIGHT),
-            ::GetSysColor(COLOR_BTNSHADOW));
-    }
+    pDC->Draw3dRect(gripper, clrHi, clrLo);
+    gripper.OffsetRect(bHorz ? sizeX : 0, bHorz ? 0 : sizeY);
+    pDC->Draw3dRect(gripper, clrHi, clrLo);
 
     m_biHide.Paint(pDC, this, CSize(ScaleX(m_cyGripper), ScaleY(m_cyGripper)));
 }

src/ExtLib/ui/sizecbar/sizecbar.cpp

@@ -82,6 +82,7 @@ CSizingControlBar::CSizingControlBar()
 
     m_hBrush_orig = nullptr;
     m_hBrush = nullptr;
+    m_hBrushClient = nullptr;
     m_dwBrushColor = 0;
     m_bUseDarkTheme = false;
 
@@ -90,13 +91,15 @@ CSizingControlBar::CSizingControlBar()
 
 CSizingControlBar::~CSizingControlBar()
 {
+    // (m_hBrush was deleted twice here and m_hBrushFrame was guarded by m_hBrush_orig, so the frame brush
+    // leaked while a freed handle was passed to DeleteObject a second time. Each brush is freed once now.)
     if (m_hBrush) {
         ::DeleteObject(m_hBrush);
     }
-    if (m_hBrush_orig) {
-        ::DeleteObject(m_hBrush);
+    if (m_hBrushClient) {
+        ::DeleteObject(m_hBrushClient);
     }
-    if (m_hBrush_orig) {
+    if (m_hBrushFrame) {
         ::DeleteObject(m_hBrushFrame);
     }
 }
@@ -106,6 +109,7 @@ BEGIN_MESSAGE_MAP(CSizingControlBar, baseCSizingControlBar)
     ON_WM_CREATE()
     ON_WM_PAINT()
     ON_WM_NCPAINT()
+    ON_WM_ERASEBKGND()
     ON_WM_NCCALCSIZE()
     ON_WM_WINDOWPOSCHANGING()
     ON_WM_CAPTURECHANGED()
@@ -573,15 +577,30 @@ void CSizingControlBar::OnNcPaint()
     //MPC-BE custom code start
     if (m_bUseDarkTheme) {
         const auto dwBrushColor = ColorThemeRGB(45, 50, 55);
-        if (m_dwBrushColor != dwBrushColor && m_hBrush) {
-            ::DeleteObject(m_hBrush);
-            m_hBrush = nullptr;
+        if (m_dwBrushColor != dwBrushColor) {
+            // the theme sliders moved - drop both cached brushes so they re-tint
+            if (m_hBrush) {
+                ::DeleteObject(m_hBrush);
+                m_hBrush = nullptr;
+            }
+            if (m_hBrushClient) {
+                ::DeleteObject(m_hBrushClient);
+                m_hBrushClient = nullptr;
+            }
         }
         m_dwBrushColor = dwBrushColor;
         if (!m_hBrush) {
             m_hBrush = ::CreateSolidBrush(dwBrushColor);
 		}
-        ::SetClassLongPtrW(m_hWnd, GCLP_HBRBACKGROUND, (LONG_PTR)m_hBrush); //MPC-BE patch
+        // The CLASS background brush is what DefWindowProc uses to erase a client strip that gets exposed
+        // during a redock/resize (before the child dialog catches up). It must be the DARK CONTENT shade,
+        // not the lighter NC/caption shade above: ColorThemeRGB scales with the brightness slider, so
+        // (45,50,55) reads as a pale/near-white rectangle at high brightness while the hosted content
+        // (shader editor dialog, lists) is (22,27,32). Keep the NC frame fill below on m_hBrush.
+        if (!m_hBrushClient) {
+            m_hBrushClient = ::CreateSolidBrush(ColorThemeRGB(22, 27, 32));
+        }
+        ::SetClassLongPtrW(m_hWnd, GCLP_HBRBACKGROUND, (LONG_PTR)m_hBrushClient); //MPC-BE patch
 
         mdc.FrameRect(rcDraw, CBrush::FromHandle(m_hBrushFrame)); // Draw Black Frame
 
@@ -631,6 +650,25 @@ void CSizingControlBar::OnPaint()
     CPaintDC dc(this);
 }
 
+BOOL CSizingControlBar::OnEraseBkgnd(CDC* pDC)
+{
+    // The bar's own client background is otherwise erased by DefWindowProc with the shared window-class
+    // brush (light COLOR_BTNFACE), which is only swapped dark as a side effect of the dark NC paint - so
+    // when a child doesn't fully cover the client (e.g. a 2px inset), or right after a redock/resize/theme
+    // toggle before the next NC paint, the exposed strip flashed WHITE. Paint it dark deterministically.
+    if (m_bUseDarkTheme) {
+        CRect rc;
+        GetClientRect(rc);
+        // Match the DARK content the bar hosts (22,27,32), NOT the lighter NC/caption shade: ColorThemeRGB
+        // scales with the brightness slider, so the old (45,50,55) fill showed up as a pale/near-white
+        // rectangle whenever a strip was briefly exposed on redock/resize.
+        pDC->FillSolidRect(rc, ColorThemeRGB(22, 27, 32));
+        return TRUE;
+    }
+
+    return baseCSizingControlBar::OnEraseBkgnd(pDC);
+}
+
 LRESULT CSizingControlBar::OnNcHitTest(CPoint point)
 {
     CRect rcBar, rcEdge;

src/ExtLib/ui/sizecbar/sizecbar.h

@@ -172,6 +172,9 @@ class CSizingControlBar : public baseCSizingControlBar
     CSize   m_szFixedFloat;
 
     HBRUSH   m_hBrush, m_hBrush_orig, m_hBrushFrame;
+    // Separate CLIENT background brush. m_hBrush is the lighter NC/caption shade; the client must match the
+    // DARK content the bar hosts (shader editor dialog / lists), or an exposed strip reads as a pale rectangle.
+    HBRUSH   m_hBrushClient;
     COLORREF m_dwBrushColor;
 //MPC-BE custom code end
 
@@ -195,6 +198,7 @@ class CSizingControlBar : public baseCSizingControlBar
     afx_msg void OnRButtonDown(UINT nFlags, CPoint point);
     afx_msg void OnWindowPosChanging(WINDOWPOS FAR* lpwndpos);
     afx_msg void OnPaint();
+    afx_msg BOOL OnEraseBkgnd(CDC* pDC);
     afx_msg void OnClose();
     afx_msg void OnSize(UINT nType, int cx, int cy);
     //}}AFX_MSG

src/apps/mplayerc/AboutDlg.cpp

@@ -21,6 +21,7 @@
 #include "stdafx.h"
 #include "AboutDlg.h"
 #include "DSUtil/FileHandle.h"
+#include "controls/DarkTheme.h"
 
 #include "Version.h"
 
@@ -94,6 +95,8 @@ BOOL CAboutDlg::OnInitDialog()
 
 	GetDlgItem(IDOK)->SetFocus();
 
+	DarkTheme::ThemeDialog(GetSafeHwnd());
+
 	return FALSE;
 }
 

src/apps/mplayerc/AddCommandDlg.cpp

@@ -20,6 +20,7 @@
 
 #include "stdafx.h"
 #include "AddCommandDlg.h"
+#include "controls/DarkTheme.h"
 
 // CAddCommandDlg dialog
 
@@ -137,6 +138,8 @@ BOOL CAddCommandDlg::OnInitDialog()
 
 	SHAutoComplete(m_FilterEdit, SHACF_AUTOAPPEND_FORCE_OFF | SHACF_AUTOSUGGEST_FORCE_OFF);
 
+	DarkTheme::ThemeDialog(GetSafeHwnd());
+
 	return TRUE;
 }
 

src/apps/mplayerc/AppSettings.cpp

@@ -852,6 +852,11 @@ void CAppSettings::LoadSettings(bool bForce/* = false*/)
 	if (iLanguage < 0) {
 		iLanguage = CMPlayerCApp::GetDefLanguage();
 	}
+	// Read the dark-theme flag before SetLanguage: SetLanguage may pop the "language pack will not
+	// work with this version" message box, and DarkTheme::IsActive() must already reflect the user's
+	// saved preference for that box to be themed (bUseDarkTheme is otherwise not read until further
+	// below, so at this point it would still hold the ResetSettings default). Harmless duplicate read.
+	profile.ReadBool(IDS_R_THEME, IDS_RS_USEDARKTHEME, bUseDarkTheme);
 	CMPlayerCApp::SetLanguage(iLanguage, false);
 
 	FiltersPriority.LoadSettings();

src/apps/mplayerc/AuthDlg.cpp

@@ -21,6 +21,7 @@
 
 #include "stdafx.h"
 #include "AuthDlg.h"
+#include "controls/DarkTheme.h"
 
 // CAuthDlg dialog
 
@@ -82,6 +83,8 @@ BOOL CAuthDlg::OnInitDialog()
 
 	m_usernamectrl.SetFocus();
 
+	DarkTheme::ThemeDialog(GetSafeHwnd());
+
 	return TRUE;
 }
 

src/apps/mplayerc/CmdLineHelpDlg.cpp

@@ -22,6 +22,7 @@
 #include "stdafx.h"
 #include "CmdLineHelpDlg.h"
 #include "Misc.h"
+#include "controls/DarkTheme.h"
 
 CmdLineHelpDlg::CmdLineHelpDlg(const CStringW& cmdLine)
 	: CResizableDialog(CmdLineHelpDlg::IDD)
@@ -117,5 +118,7 @@ BOOL CmdLineHelpDlg::OnInitDialog()
 
 	EnableSaveRestore(IDS_R_DLG_CMD_LINE_HELP);
 
+	DarkTheme::ThemeDialog(GetSafeHwnd());
+
 	return FALSE;
 }