Fix flickering when redrawing menu borders

We no longer need to wait until it is possible to redraw borders

This option is now enabled by default

Thanks to TranslucentFlyouts project

Author: krlvm

AcrylicMenus/MenuHandler.cpp

@@ -69,11 +69,6 @@ void CALLBACK MenuHandler::WinEventProc(
 						DwmSetWindowAttribute(hWnd, DWMWA_BORDER_COLOR, &dwColorBorder, sizeof(COLORREF));
 					}
 				}
-				else if (MENU_REDRAW_BORDER && (!MenuManager::g_bIsDarkMode || SettingsHelper::g_redrawDarkThemeBorders10))
-				{
-					// We can't draw on non-client area right after window has showed
-					WindowHelper::SendMessageDelayed(hWnd, WM_REDRAWBORDER, 160);	
-				}
 			}
 			break;
 		}
@@ -93,6 +88,8 @@ void CALLBACK MenuHandler::WinEventProc(
 	}
 }
 
+static constexpr int nonClientMarginSize{ 3 };
+static constexpr int systemOutlineSize{ 1 };
 LRESULT CALLBACK MenuHandler::SubclassProc(
 	HWND hWnd,
 	UINT uMsg,
@@ -102,13 +99,66 @@ LRESULT CALLBACK MenuHandler::SubclassProc(
 	DWORD_PTR dwRefData
 )
 {
+	bool handled = false;
+	LRESULT result{ 0 };
+
 	switch (uMsg)
 	{
-	case WM_REDRAWBORDER:
+#if (MENU_REDRAW_BORDER == TRUE)
+	///
+	/// Windows 10 has ugly white context menu borders
+	/// As the borders are in the non-client area,
+	/// we can't hook the painting event and need
+	/// to redraw them manually
+	/// 
+	/// This is enabled only for light mode menus,
+	/// because it is noticeable, due to low contrast
+	/// between menu background color and original white border,
+	/// but this is very noticeable in dark mode
+	/// 
+	/// On Windows 11, we change borders color
+	/// natively using DwmSetWindowAttribute API
+	///
+	case WM_PRINT:
+		{
+			handled = true;
+
+			POINT pt;
+
+			HDC wndDC = (HDC)wParam;
+			SaveDC(wndDC);
+
+			RECT rcPaint;
+			GetClipBox(wndDC, &rcPaint);
+			FillRect(wndDC, &rcPaint, GetStockBrush(BLACK_BRUSH));
+
+			SetViewportOrgEx(wndDC, nonClientMarginSize, nonClientMarginSize, &pt);
+			result = DefSubclassProc(hWnd, WM_PRINTCLIENT, wParam, lParam);
+
+			SetViewportOrgEx(wndDC, pt.x, pt.y, nullptr);
+			
+			RestoreDC(wndDC, -1);
+		}
+		break;
+	case WM_NCPAINT:
 		{
-			WindowHelper::RedrawMenuBorder(hWnd);
+			handled = true;
+
+			HDC wndDC = GetWindowDC(hWnd);
+
+			if (wParam != NULLREGION && wParam != ERROR)
+			{
+				SelectClipRgn(wndDC, reinterpret_cast<HRGN>(wParam));
+			}
+
+			RECT rcPaint;
+			GetClipBox(wndDC, &rcPaint);
+			FillRect(wndDC, &rcPaint, GetStockBrush(BLACK_BRUSH));
+
+			ReleaseDC(hWnd, wndDC);
 		}
 		break;
+#endif
 	case MN_BUTTONUP:
 		{
 			// We need to prevent the system default menu fade out animation
@@ -163,5 +213,10 @@ LRESULT CALLBACK MenuHandler::SubclassProc(
 		break;
 	}
 
-	return DefSubclassProc(hWnd, uMsg, wParam, lParam);
+	if (!handled)
+	{
+		result = DefSubclassProc(hWnd, uMsg, wParam, lParam);
+	}
+
+	return result;
 }

AcrylicMenus/WindowHelper.h

@@ -7,39 +7,6 @@ namespace AcrylicMenus
 {
 namespace WindowHelper
 {
-	///
-	/// Windows 10 has ugly white context menu borders
-	/// As the borders are in the non-client area,
-	/// we can't hook the painting event and need
-	/// to redraw them manually
-	/// 
-	/// This is enabled only for light mode menus,
-	/// because it is noticeable, due to low contrast
-	/// between menu background color and original white border,
-	/// but this is very noticeable in dark mode
-	/// 
-	/// On Windows 11, we change borders color
-	/// natively using DwmSetWindowAttribute API
-	///
-
-	void RedrawMenuBorder(HWND hWnd)
-	{
-		RECT wndRect;
-		GetWindowRect(hWnd, &wndRect);
-		OffsetRect(&wndRect, -wndRect.left, -wndRect.top);
-
-		HDC wndDC = GetWindowDC(hWnd);
-
-		ExcludeClipRect(wndDC,
-			wndRect.left + 1,
-			wndRect.top + 1,
-			wndRect.right - 1,
-			wndRect.bottom - 1
-		);
-
-		FillRect(wndDC, &wndRect, (HBRUSH)GetStockObject(BLACK_BRUSH));
-	}
-
 	///
 	/// After user selects option, if menu fade out animation
 	/// is enabled in system settings, system will draw
@@ -146,37 +113,5 @@ namespace WindowHelper
 	}
 
 	#pragma endregion
-
-	#pragma region Delayed Message
-
-	struct DELAYEDMESSAGEINFO
-	{
-		HWND   hWnd;
-		UINT   uMsg;
-		DWORD  dwDelayMilliseconds;
-	};
-	DWORD WINAPI SendMessageDelayedThreadProc(LPVOID lpParameter)
-	{
-		DELAYEDMESSAGEINFO* info = (DELAYEDMESSAGEINFO*)lpParameter;
-		if (info->dwDelayMilliseconds)
-		{
-			Sleep(info->dwDelayMilliseconds);
-		}
-		SendMessage(info->hWnd, info->uMsg, 0, 0);
-		delete info;
-		return 0;
-	}
-	void SendMessageDelayed(HWND hWnd, UINT uMsg, DWORD dwDelayMilliseconds)
-	{
-		DELAYEDMESSAGEINFO* info = new DELAYEDMESSAGEINFO;
-		info->hWnd = hWnd;
-		info->uMsg = uMsg;
-		info->dwDelayMilliseconds = dwDelayMilliseconds;
-
-		HANDLE hThread = CreateThread(NULL, 0, &SendMessageDelayedThreadProc, info, 0, NULL);
-		if (hThread) CloseHandle(hThread);
-	}
-
-	#pragma endregion
 }
 }

AcrylicMenus/dllmain.cpp

@@ -7,7 +7,6 @@ using namespace AcrylicMenus;
 
 HMODULE g_hModule = nullptr;
 bool SystemHelper::g_bIsWindows11 = false;
-bool SettingsHelper::g_redrawDarkThemeBorders10 = false;
 
 BOOL APIENTRY DllMain(
     HMODULE hModule,
@@ -22,7 +21,6 @@ BOOL APIENTRY DllMain(
 			g_hModule = hModule;
 			DisableThreadLibraryCalls(hModule);
 			SystemHelper::g_bIsWindows11 = SystemHelper::DetectOSBuildNumber() >= 22000;
-			SettingsHelper::g_redrawDarkThemeBorders10 = SettingsHelper::IsFeatureEnabled(L"RedrawDarkThemeBorders");
 			AcrylicMenus::Startup();
 			break;
 		}