From afa114ca78b65f17b5bca10deaac1cd08aa620a6 Mon Sep 17 00:00:00 2001 From: sdottaka Date: Fri, 24 Jan 2025 08:57:40 +0900 Subject: [PATCH] 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. --- Src/MainFrm.cpp | 2 +- Src/TitleBarHelper.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 15545a3749b..558eaca822c 100644 --- 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 index 3819f84672f..2a8d78d1a9c 100644 --- 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)