From aedb3b85fed48cb2cf0abb5fafa8e7591644c9f4 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 02 十二月 2024 08:53:06 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh

---
 SourceCode/Bond/BondEq/View/UserManagerDlg.h |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/BondEq/UserManagerDlg.h b/SourceCode/Bond/BondEq/View/UserManagerDlg.h
similarity index 74%
rename from SourceCode/Bond/BondEq/UserManagerDlg.h
rename to SourceCode/Bond/BondEq/View/UserManagerDlg.h
index 34fad57..c311784 100644
--- a/SourceCode/Bond/BondEq/UserManagerDlg.h
+++ b/SourceCode/Bond/BondEq/View/UserManagerDlg.h
@@ -23,12 +23,17 @@
 	void AddRow(CGridCtrl* pGridCtrl);
 	void DeleteSelectedRow(CGridCtrl* pGridCtrl);
 	bool IsUsernameDuplicate(const CString& username);
-	void AdjustControls(int nWidth, int nHeight);
+	CFont* GetOrCreateFont(int nFontSize);
+	void SetDefaultFont();
+	void AdjustControls(float dScaleX, float dScaleY);
 	void AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight);
 
 private:
 	int m_nInitialWidth;
 	int m_nInitialHeight;
+	std::map<int, CRect> m_mapCtrlLayouts;
+	std::map<int, CFont*> m_mapFonts;
+	std::map<CString, CString> m_mapRoleDescriptions;
 
 private:
 	CGridCtrl m_gridUserManager;
@@ -40,6 +45,8 @@
 public:
 	virtual BOOL OnInitDialog();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
+	afx_msg void OnGetMinMaxInfo(MINMAXINFO* lpMMI);
+	afx_msg void OnGridComboSelChange(NMHDR* pNMHDR, LRESULT* pResult);
 	afx_msg void OnBnClickedButtonAdd();
 	afx_msg void OnBnClickedButtonInsert();
 	afx_msg void OnBnClickedButtonDel();

--
Gitblit v1.9.3