修正消息对话框调整大小时控件位置不正确的问题

Author: zhongyang219

TrafficMonitor/BaseDialog.cpp

@@ -260,6 +260,24 @@ void CBaseDialog::SetButtonIcon(UINT id, HICON hIcon)
         btn->SetIcon(hIcon);
 }
 
+CRect CBaseDialog::GetControlRect(CWnd* pCtrl)
+{
+    if (pCtrl != nullptr)
+    {
+        CRect rect;
+        pCtrl->GetWindowRect(rect);
+        ScreenToClient(rect);
+        return rect;
+    }
+    return CRect();
+}
+
+CRect CBaseDialog::GetControlRect(UINT id)
+{
+    CWnd* pCtrl = GetDlgItem(id);
+    return GetControlRect(pCtrl);
+}
+
 void CBaseDialog::IterateControls(std::function<void(CWnd*)> func)
 {
     func(this);

TrafficMonitor/BaseDialog.h

@@ -79,6 +79,8 @@ class CBaseDialog : public CDialog
     void EnableDlgCtrl(UINT id, bool enable);
     void SetButtonIcon(UINT id, HICON hIcon);
     void SetRememberDlgSize(bool enable) { m_remember_dlg_size = enable; }
+    CRect GetControlRect(CWnd* pCtrl);
+    CRect GetControlRect(UINT id);
 
     //遍历所有子控件
     void IterateControls(std::function<void(CWnd*)> func);

TrafficMonitor/MessageDlg.cpp

@@ -71,21 +71,6 @@ void CMessageDlg::SetStandarnMessageIcon(StandardIcon standard_icon)
 		SetMessageIcon(hIcon);
 }
 
-void CMessageDlg::SetInfoStaticSize(int cx)
-{
-    if (m_icon != NULL && m_info_static.GetSafeHwnd() != NULL)
-    {
-        CRect rc_info{ m_rc_info };
-		//设置Static控件水平位置，为图标腾出空间
-        rc_info.left = m_rc_info.left + MESSAGE_DLG_ICON_SIZE + theApp.DPI(8);
-        if (cx > 0)
-            rc_info.right = cx;
-		//设置Static控件的垂直位置
-		rc_info.MoveToY(rc_info.top + MESSAGE_DLG_ICON_VERTIAL_MARGIN);
-        m_info_static.MoveWindow(rc_info);
-    }
-}
-
 void CMessageDlg::DoDataExchange(CDataExchange* pDX)
 {
 	CBaseDialog::DoDataExchange(pDX);
@@ -133,31 +118,28 @@ BOOL CMessageDlg::OnInitDialog()
     //设置图标的位置
     if (m_icon != NULL)
     {
-		CRect rc_edit;
-        m_message_edit.GetWindowRect(rc_edit);
+		CRect rc_info = GetControlRect(&m_info_static);
+		//设置Static控件水平位置，为图标腾出空间
+		rc_info.left = rc_info.left + MESSAGE_DLG_ICON_SIZE + theApp.DPI(8);
+		//设置Static控件的垂直位置
+		rc_info.MoveToY(rc_info.top + MESSAGE_DLG_ICON_VERTIAL_MARGIN);
+		m_info_static.MoveWindow(rc_info);
+
+		CRect rc_edit = GetControlRect(&m_message_edit);
 		rc_edit.top += (MESSAGE_DLG_ICON_VERTIAL_MARGIN * 2);
-        ScreenToClient(rc_edit);
-        m_icon_pos.x = rc_edit.left;
-        m_icon_pos.y = (rc_edit.top - MESSAGE_DLG_ICON_SIZE) / 2;
+		m_icon_pos.x = rc_edit.left;
+		m_icon_pos.y = (rc_edit.top - MESSAGE_DLG_ICON_SIZE) / 2;
 		m_message_edit.MoveWindow(rc_edit);
-
-        m_info_static.GetWindowRect(m_rc_info);
-        ScreenToClient(m_rc_info);
-        SetInfoStaticSize(0);
     }
 
 	//没有图标，且消息标题为空时，隐藏Static控件
 	if (m_icon == NULL && m_info.IsEmpty())
 	{
-		CRect rc_edit;
-		m_message_edit.GetWindowRect(rc_edit);
-		ScreenToClient(rc_edit);
-		m_info_static.GetWindowRect(m_rc_info);
-		ScreenToClient(m_rc_info);
-		rc_edit.top = m_rc_info.top;
+		CRect rc_info = GetControlRect(&m_info_static);
+		CRect rc_edit = GetControlRect(&m_message_edit);
+		rc_edit.top = rc_info.top;
 		m_message_edit.MoveWindow(rc_edit);
 		m_info_static.ShowWindow(SW_HIDE);
-
 	}
 
 	return TRUE;  // return TRUE unless you set the focus to a control
@@ -202,6 +184,21 @@ void CMessageDlg::OnSize(UINT nType, int cx, int cy)
 {
     CBaseDialog::OnSize(nType, cx, cy);
 
-    // TODO: 在此处添加消息处理程序代码
-    SetInfoStaticSize(cx);
+	if (m_info_static.GetSafeHwnd() != NULL && m_icon != NULL)
+	{
+		CRect rc_info = GetControlRect(&m_info_static);
+		rc_info.right = cx;
+		m_info_static.MoveWindow(rc_info);
+	}
+	if (m_message_edit.GetSafeHwnd() != NULL)
+	{
+		CRect rc_edit = GetControlRect(&m_message_edit);
+		//设置Edit控件的垂直位置
+		CRect rc_ok = GetControlRect(IDOK);
+		if (!rc_ok.IsRectEmpty())
+		{
+			rc_edit.bottom = rc_ok.top - theApp.DPI(6);
+			m_message_edit.MoveWindow(rc_edit);
+		}
+	}
 }

TrafficMonitor/MessageDlg.h

@@ -49,13 +49,10 @@ class CMessageDlg : public CBaseDialog
 
     HICON m_icon{};
     CPoint m_icon_pos{};        //图标的位置
-    CRect m_rc_info{};          //错误信息Static控件的初始区域
 
 	//bool m_show_link_ctrl{ false };
 
 protected:
-    void SetInfoStaticSize(int cx);     //如果设置了图标，则需要将错误信息Static控件向右移动一些
-
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 支持
 
 	DECLARE_MESSAGE_MAP()