Fix an issue where an unnatural drawing shift occurs momentarily when…

… launching WinMerge if Windows animation effects are enabled and the WinMerge window is maximized.
WinMerge · Jan 23, 2025 · afa114c · afa114c
1 parent 44d7978
commit afa114c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
@@ -2541,7 +2541,7 @@ void CMainFrame::OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncs
 	{
 		if (IsZoomed())
 		{
-			lpncsp->rgrc[0].top = rcWindow.top + GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CXPADDEDBORDER);
+			lpncsp->rgrc[0].top = rcWindow.top + 0;
 			//lpncsp->rgrc[0].left += 1;
 			//lpncsp->rgrc[0].right -= 1;
 			lpncsp->rgrc[0].bottom -= 1;

diff --git a/Src/TitleBarHelper.cpp b/Src/TitleBarHelper.cpp
@@ -41,7 +41,8 @@ void CTitleBarHelper::Init(CWnd *pWnd)
 
 int CTitleBarHelper::GetTopMargin() const
 {
-	return 0;
+	return m_maximized ?
+		(GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CXPADDEDBORDER)) : 0;
 }
 
 void CTitleBarHelper::DrawIcon(CWnd* pWnd, CDC& dc, bool active)