[commit] r2803 - trunk/SDK/DecoratorLib

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Oct  1 11:44:26 2021
New Revision: 2803

Log:
InPlace decorator edit: fix position due to border in dialog

Modified:
   trunk/SDK/DecoratorLib/InPlaceEditDialog.cpp

Modified: trunk/SDK/DecoratorLib/InPlaceEditDialog.cpp
==============================================================================
--- trunk/SDK/DecoratorLib/InPlaceEditDialog.cpp	Mon Apr  5 11:26:19 2021	(r2802)
+++ trunk/SDK/DecoratorLib/InPlaceEditDialog.cpp	Fri Oct  1 11:44:26 2021	(r2803)
@@ -135,6 +135,11 @@
 
 	m_realParentCWnd = GetParent();
 
+	CRect windowRect;
+	GetWindowRect(windowRect);
+	CRect clientRect;
+	GetClientRect(clientRect);
+
 	///////////////////////////////////////////////////////////////////////////////////////////////////
 	CDC dc;
 	dc.Attach(m_transformHDC);
@@ -178,6 +183,13 @@
 
 	POINT editLeftTopPt = { m_labelRect.left, m_labelRect.top };
 	BOOL success = ::LPtoDP(m_transformHDC, &editLeftTopPt, 1);
+
+	POINT borderWidth = { (windowRect.Width() - clientRect.Width()) / 2, (windowRect.Height() - clientRect.Height()) / 2 };
+	borderWidth.x = MulDiv(borderWidth.x, viewPortExt.cx, windowExt.cx);
+	borderWidth.y = MulDiv(borderWidth.y, viewPortExt.cy, windowExt.cy);
+	editLeftTopPt.x += borderWidth.x;
+	editLeftTopPt.y -= borderWidth.y;
+
 	m_intendedParentCWnd->ClientToScreen(&editLeftTopPt);
 	m_initialRect = CRect(editLeftTopPt, cSize);