From b4a91dbce5d4818c5df634c9eb84f6128145eb33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Thu, 12 Jan 2023 01:05:06 +0100
Subject: [PATCH] Disable dark mode in disasm window, and the scrollbar hack

---
 Windows/Debugger/Debugger_Disasm.cpp | 6 +++---
 Windows/W32Util/DarkMode.cpp         | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Windows/Debugger/Debugger_Disasm.cpp b/Windows/Debugger/Debugger_Disasm.cpp
index 6d3929abca..584533703d 100644
--- a/Windows/Debugger/Debugger_Disasm.cpp
+++ b/Windows/Debugger/Debugger_Disasm.cpp
@@ -11,7 +11,7 @@
 #include "Windows/Debugger/Debugger_Disasm.h"
 #include "Windows/Debugger/Debugger_VFPUDlg.h"
 #include "Windows/Debugger/DebuggerShared.h"
-#include "Windows/W32Util/DarkMode.h"
+// #include "Windows/W32Util/DarkMode.h"
 
 #include "Windows/main.h"
 #include "Windows/Debugger/CtrlRegisterList.h"
@@ -349,7 +349,7 @@ BOOL CDisasm::DlgProc(UINT message, WPARAM wParam, LPARAM lParam)
 	switch(message)
 	{
 	case WM_INITDIALOG:
-		DarkModeInitDialog(m_hDlg);
+		// DarkModeInitDialog(m_hDlg);
 		return TRUE;
 
 	case WM_NOTIFY:
@@ -689,7 +689,7 @@ BOOL CDisasm::DlgProc(UINT message, WPARAM wParam, LPARAM lParam)
 		}
 		break;
 	}
-	return DarkModeDlgProc(m_hDlg, message, wParam, lParam);
+	return 0; // DarkModeDlgProc(m_hDlg, message, wParam, lParam);
 }
 
 void CDisasm::updateThreadLabel(bool clear)
diff --git a/Windows/W32Util/DarkMode.cpp b/Windows/W32Util/DarkMode.cpp
index 34c71d54f2..e22fc06629 100644
--- a/Windows/W32Util/DarkMode.cpp
+++ b/Windows/W32Util/DarkMode.cpp
@@ -81,6 +81,9 @@ void AllowDarkModeForApp(bool allow)
 
 void FixDarkScrollBar()
 {
+	// Disable this, doesn't look good.
+	return;
+
 	HMODULE hComctl = LoadLibraryExW(L"comctl32.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
 	if (hComctl)
 	{