Now respects dark mode and light mode making native window background…

… on Windows either black or white.
sinterdev · Nov 21, 2024 · 57552aa · 57552aa
1 parent a1bebaf
commit 57552aa
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/Photino.Native/Photino.Windows.cpp b/Photino.Native/Photino.Windows.cpp
@@ -46,6 +46,9 @@ struct ShowMessageParams
 };
 
 
+const HBRUSH darkBrush = CreateSolidBrush(RGB(0, 0, 0));
+const HBRUSH lightBrush = CreateSolidBrush(RGB(255, 255, 255));
+
 void Photino::Register(HINSTANCE hInstance)
 {
 	InitDarkModeSupport();
@@ -62,7 +65,7 @@ void Photino::Register(HINSTANCE hInstance)
 	wcx.hInstance = hInstance;
 	wcx.hIcon = LoadIcon(hInstance, IDI_APPLICATION);
 	wcx.hCursor = LoadCursor(nullptr, IDC_ARROW);
-	wcx.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+	wcx.hbrBackground = IsDarkModeEnabled() ? darkBrush : lightBrush;
 	wcx.lpszMenuName = nullptr;
 	wcx.lpszClassName = CLASS_NAME;
 	wcx.hIconSm = LoadIcon(hInstance, IDI_APPLICATION);
@@ -320,6 +323,7 @@ HWND Photino::getHwnd()
 	return _hWnd;
 }
 
+
 LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	switch (uMsg)
@@ -328,21 +332,45 @@ LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	{
 		EnableDarkMode(hwnd, true);
 		if (IsDarkModeEnabled()) 
-		{
 			RefreshNonClientArea(hwnd);
-		}
 		break;
 	}
 	case WM_SETTINGCHANGE: 
 	{
 		if (IsColorSchemeChange(lParam))
 			SendMessageW(hwnd, WM_THEMECHANGED, 0, 0);
+
 		break;
 	}
 	case WM_THEMECHANGED:
 	{
 		EnableDarkMode(hwnd, IsDarkModeEnabled());
 		RefreshNonClientArea(hwnd);
+		InvalidateRect(hwnd, NULL, TRUE);
+		break;
+	}
+	case WM_PAINT:
+	{
+		PAINTSTRUCT ps;
+		HDC hdc = BeginPaint(hwnd, &ps);
+
+		// Fill the background with the current theme color
+		if (IsDarkModeEnabled())
+		{
+			FillRect(hdc, &ps.rcPaint, darkBrush);
+			//SetTextColor(hdc, RGB(255,255,255));
+		}
+		else
+		{
+			FillRect(hdc, &ps.rcPaint, lightBrush);
+			//SetTextColor(hdc, RGB(0, 0, 0));
+		}
+
+		// Draw some text
+		//SetBkMode(hdc, TRANSPARENT);
+		//TextOut(hdc, 10, 10, L"Hello, World! (Dynamic Theme)", 31);
+
+		EndPaint(hwnd, &ps);
 		break;
 	}
 	case WM_ACTIVATE:

diff --git a/Photino.Test/Program.cs b/Photino.Test/Program.cs
@@ -78,8 +78,8 @@ private static void FluentStyle()
                 //.SetMaximized(true)
                 //.SetMaxSize(640, 480)
                 //.SetMinimized(true)
-                .SetMinHeight(240)
-                .SetMinWidth(320)
+                .SetMinHeight(480)
+                .SetMinWidth(640)
                 //.SetMinSize(320, 240)
                 //.SetResizable(false)
                 //.SetTopMost(true)

diff --git a/Photino.Test/wwwroot/main.html b/Photino.Test/wwwroot/main.html
@@ -267,7 +267,7 @@
 
     </script>
 </head>
-<body style="background-color: rgba(0,0,0,0)">
+<body>
     <h1 id="Title">Test Bench</h1>
     <b>Window</b><br>
     <button onclick="SetIconFile()">Icon</button>