- basic support for darkmode for AboutDialog

- not adapted sub childs (OK button) of AboutDialog

Author: chcg

include/Common.h

@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-// NOTE : Extremely cleaned out, if you need more go to: https://github.com/notepad-plus-plus/notepad-plus-plus/blob/master/PowerEditor/src/MISC/Common/Common.h
-
 #pragma once
 #include <vector>
 #include <string>

include/NppDarkMode.h

@@ -19,6 +19,7 @@
 #include <string>
 #include <windows.h>
 
+
 namespace NppDarkMode
 {
 	struct Colors

src/AboutDialog/AboutDlg.cpp

@@ -1,15 +1,16 @@
 #include "AboutDlg.h"
-#include "PluginInterface.h"
 
 void AboutDialog::doDialog()
 {
 	if (!isCreated())
 		create(IDD_ABOUT_DIALOG);
 
-	goToCenter();
+	// Adjust the position of AboutBox
+	moveForDpiChange();
+	goToCenter(SWP_SHOWWINDOW | SWP_NOSIZE);
 }
 
-INT_PTR CALLBACK AboutDialog::run_dlgProc(UINT message, WPARAM wParam, LPARAM /*lParam*/)
+intptr_t CALLBACK AboutDialog::run_dlgProc(UINT message, WPARAM wParam, LPARAM /*lParam*/)
 {
 	switch (message) {
 	case WM_INITDIALOG:
@@ -19,6 +20,22 @@ INT_PTR CALLBACK AboutDialog::run_dlgProc(UINT message, WPARAM wParam, LPARAM /*
 
 			return TRUE;
 		}
+
+	case WM_CTLCOLORDLG:
+	case WM_CTLCOLORSTATIC:
+		{
+			return NppDarkMode::onCtlColorDarker(reinterpret_cast<HDC>(wParam));
+		}
+
+	case WM_PRINTCLIENT:
+		{
+			if (NppDarkMode::isEnabled())
+			{
+				return TRUE;
+			}
+			break;
+		}
+
 	case WM_COMMAND:
 		{
 			switch (wParam) {

src/AboutDialog/AboutDlg.h

@@ -1,15 +1,14 @@
-#ifndef ABOUT_DLG_H
-#define ABOUT_DLG_H
+#pragma once
 
 #include "PluginInterface.h"
-#include "StaticDialog.h"
 #include "URLCtrl.h"
 #include "../resources/resource.h"
+#include "StaticDialog.h"
 
 class AboutDialog : public StaticDialog
 {
 public:
-	AboutDialog() : StaticDialog() {};
+	AboutDialog() = default;
 
 	void init( HINSTANCE hInst, NppData nppData )
 	{
@@ -19,13 +18,13 @@ class AboutDialog : public StaticDialog
 
 	void doDialog();
 
-	virtual void destroy()
+	void destroy() override
 	{
 		_urlNppPlugin.destroy();
 	};
 
 protected:
-	virtual INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM /*lParam*/);
+	intptr_t CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM /*lParam*/) override;
 
 private:
 	// Handles
@@ -34,5 +33,3 @@ class AboutDialog : public StaticDialog
 	// Url control
 	URLCtrl	_urlNppPlugin;
 };
-
-#endif //ABOUT_DLG_H

src/NppDarkModeDummy.cpp

@@ -25,6 +25,11 @@ namespace NppDarkMode
 		return ::CreateSolidBrush(HEXRGB(0x202020));
 	}
 
+	COLORREF getTextColor()
+	{
+		return HEXRGB(0xE0E0E0);
+	}
+
 	COLORREF getDarkerTextColor()
 	{
 		return HEXRGB(0xC0C0C0);
@@ -35,6 +40,11 @@ namespace NppDarkMode
 		return HEXRGB(0xFFFF00);
 	}
 
+	COLORREF getDarkerBackgroundColor()
+	{
+		return HEXRGB(0x202020);
+	}
+
 	void setDarkTitleBar(HWND /*hwnd*/)
 	{
 	}
@@ -43,4 +53,17 @@ namespace NppDarkMode
 	{
 		return false;
 	}
+
+	LRESULT onCtlColorDarker(HDC hdc)
+	{
+		if (!NppDarkMode::isEnabled())
+		{
+			return FALSE;
+		}
+
+		::SetTextColor(hdc, NppDarkMode::getTextColor());
+		::SetBkColor(hdc, NppDarkMode::getDarkerBackgroundColor());
+		return reinterpret_cast<LRESULT>(NppDarkMode::getDarkerBackgroundBrush());
+	}
+
 }

src/StaticDialog.cpp

@@ -18,7 +18,7 @@
 #include <windows.h>
 #include "StaticDialog.h"
 #include "Common.h"
-#include "NppDarkMode.h"
+//#include "NppDarkMode.h"
 
 StaticDialog::~StaticDialog()
 {

src/URLCtrl.cpp

@@ -147,7 +147,19 @@ LRESULT URLCtrl::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
 			PAINTSTRUCT ps{};
             HDC hdc = ::BeginPaint(hwnd, &ps);
 
-            ::SetTextColor(hdc, _linkColor);
+			if ((_linkColor == _visitedColor) || (_linkColor == NppDarkMode::getDarkerTextColor()))
+			{
+				_linkColor = NppDarkMode::isEnabled() ? NppDarkMode::getDarkerTextColor() : _visitedColor;
+				::SetTextColor(hdc, _linkColor);
+			}
+			else if (NppDarkMode::isEnabled())
+			{
+				::SetTextColor(hdc, NppDarkMode::getLinkTextColor());
+			}
+			else
+			{
+				::SetTextColor(hdc, _linkColor);
+			}
 
             ::SetBkColor(hdc, getCtrlBgColor(GetParent(hwnd))); ///*::GetSysColor(COLOR_3DFACE)*/);