From fb682f27d7cc98ea1bd9816f42b2e959eebd25ec Mon Sep 17 00:00:00 2001 From: RaiKoHoff Date: Thu, 17 Sep 2020 13:54:38 +0200 Subject: [PATCH 1/2] + fix: bring back themed ReBar (Toolbar parent) for Win7 --- src/Notepad3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Notepad3.c b/src/Notepad3.c index b56e4c2f9..428a7dc2b 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -2672,7 +2672,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) 0,0,0,0,hwnd,(HMENU)IDC_REBAR,hInstance,NULL); // Theme = false (!) ~ you cannot change a toolbar's color when a visual style is active - InitWindowCommon(Globals.hwndRebar, false); + InitWindowCommon(Globals.hwndRebar, !IsWindows10OrGreater()); #ifdef D_NP3_WIN10_DARK_MODE if (IsDarkModeSupported()) { From e62ac20b46af6c8b7011736629eb439fae65a643 Mon Sep 17 00:00:00 2001 From: RaiKoHoff Date: Thu, 17 Sep 2020 14:03:57 +0200 Subject: [PATCH 2/2] + fix: bring back themed ReBar (Toolbar parent) for Win10 using LightMode (DarkMode not wanted) --- src/Notepad3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Notepad3.c b/src/Notepad3.c index 428a7dc2b..944bb8e42 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -2672,7 +2672,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance) 0,0,0,0,hwnd,(HMENU)IDC_REBAR,hInstance,NULL); // Theme = false (!) ~ you cannot change a toolbar's color when a visual style is active - InitWindowCommon(Globals.hwndRebar, !IsWindows10OrGreater()); + InitWindowCommon(Globals.hwndRebar, !(IsWindows10OrGreater() && IsDarkModeSupported())); #ifdef D_NP3_WIN10_DARK_MODE if (IsDarkModeSupported()) {