From d84ddeea533a8e5f122cc4a2fed06e93c2aacf3d Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期四, 21 十一月 2024 18:30:02 +0800
Subject: [PATCH] 1.显示对话框继续缩放 2.登录界面加载图片
---
SourceCode/Bond/BondEq/View/SystemLogManagerDlg.cpp | 191 ++++++++++++++++++++++++++++++-----------------
1 files changed, 120 insertions(+), 71 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/SystemLogManagerDlg.cpp b/SourceCode/Bond/BondEq/View/SystemLogManagerDlg.cpp
index db8da77..f5603fb 100644
--- a/SourceCode/Bond/BondEq/View/SystemLogManagerDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/SystemLogManagerDlg.cpp
@@ -5,8 +5,6 @@
#include "BondEq.h"
#include "afxdialogex.h"
#include "SystemLogManagerDlg.h"
-#include "UserManager.h"
-#include "SystemLogManager.h"
// CSystemLogManagerDlg 瀵硅瘽妗�
@@ -16,11 +14,19 @@
CSystemLogManagerDlg::CSystemLogManagerDlg(CWnd* pParent /*=nullptr*/)
: CDialogEx(IDD_DIALOG_SYSTEM_LOG_MANAGER, pParent)
{
-
+ m_nInitialWidth = 0;
+ m_nInitialHeight = 0;
}
CSystemLogManagerDlg::~CSystemLogManagerDlg()
{
+ for (auto& pair : m_mapFonts) {
+ if (pair.second) {
+ pair.second->DeleteObject();
+ delete pair.second;
+ }
+ }
+ m_mapFonts.clear();
}
void CSystemLogManagerDlg::DoDataExchange(CDataExchange* pDX)
@@ -61,15 +67,15 @@
m_listLogs.SetFixedColumnCount(nFixCols);
// Col
- m_listLogs.SetColumnWidth(nColIdx, 20);
+ m_listLogs.SetColumnWidth(nColIdx, 10);
m_listLogs.SetItemText(nRowIdx, nColIdx++, _T("No."));
- m_listLogs.SetColumnWidth(nColIdx, 70);
+ m_listLogs.SetColumnWidth(nColIdx, 10);
m_listLogs.SetItemText(nRowIdx, nColIdx++, _T("绫诲瀷"));
- m_listLogs.SetColumnWidth(nColIdx, 150);
+ m_listLogs.SetColumnWidth(nColIdx, 100);
m_listLogs.SetItemText(nRowIdx, nColIdx++, _T("浜嬩欢"));
- m_listLogs.SetColumnWidth(nColIdx, 70);
+ m_listLogs.SetColumnWidth(nColIdx, 30);
m_listLogs.SetItemText(nRowIdx, nColIdx++, _T("鐢ㄦ埛"));
- m_listLogs.SetColumnWidth(nColIdx, 70);
+ m_listLogs.SetColumnWidth(nColIdx, 50);
m_listLogs.SetItemText(nRowIdx, nColIdx++, _T("鏃堕棿"));
// 鍒涘缓 20 琛岀┖鐧芥暟鎹
@@ -147,11 +153,30 @@
}
}
- m_listLogs.Invalidate();
- m_listLogs.UpdateWindow();
m_listLogs.ExpandColumnsToFit(FALSE);
m_listLogs.ExpandLastColumn();
+ m_listLogs.Invalidate();
+ m_listLogs.UpdateWindow();
+
UpdatePageInfo();
+}
+
+CFont* CSystemLogManagerDlg::GetOrCreateFont(int nFontSize)
+{
+ auto it = m_mapFonts.find(nFontSize);
+ if (it != m_mapFonts.end()) {
+ return it->second;
+ }
+
+ CFont* font = new CFont();
+ LOGFONT logFont = { 0 };
+ _tcscpy_s(logFont.lfFaceName, _T("Segoe UI"));
+ logFont.lfHeight = -nFontSize;
+ logFont.lfQuality = CLEARTYPE_QUALITY;
+ font->CreateFontIndirect(&logFont);
+ m_mapFonts[nFontSize] = font;
+
+ return font;
}
void CSystemLogManagerDlg::UpdatePageInfo()
@@ -164,64 +189,58 @@
void CSystemLogManagerDlg::SetDefaultFont()
{
- CFont* pFont = new CFont();
- LOGFONT logFont = { 0 };
+ CFont* defaultFont = GetOrCreateFont(12);
- // 璁剧疆瀛椾綋灞炴��
- _tcscpy_s(logFont.lfFaceName, _T("Segoe UI")); // 浣跨敤娓呮櫚瀛椾綋
- logFont.lfHeight = -12; // 瀛椾綋楂樺害
- logFont.lfWeight = FW_NORMAL;
- logFont.lfQuality = CLEARTYPE_QUALITY; // 鍚敤 ClearType 鎶楅敮榻�
-
- pFont->CreateFontIndirect(&logFont);
-
- // 閬嶅巻鎵�鏈夋帶浠讹紝搴旂敤瀛椾綋
+ // 閬嶅巻鎵�鏈夋帶浠讹紝搴旂敤榛樿瀛椾綋
CWnd* pWnd = GetWindow(GW_CHILD);
while (pWnd) {
+ // 璺宠繃鐗规畩鎺т欢锛堝 MFCGridCtrl锛�
TCHAR szClassName[256];
GetClassName(pWnd->m_hWnd, szClassName, sizeof(szClassName));
- if (_tcsicmp(szClassName, _T("MFCGridCtrl")) == 0
- || _tcsicmp(szClassName, _T("ComboBoxs")) == 0) {
+ if (_tcsicmp(szClassName, _T("MFCGridCtrl")) == 0) {
pWnd = pWnd->GetNextWindow();
continue;
}
- pWnd->SetFont(pFont, TRUE);
+ pWnd->SetFont(defaultFont, TRUE);
pWnd = pWnd->GetNextWindow();
}
}
-void CSystemLogManagerDlg::AdjustControls(int nWidth, int nHeight)
+void CSystemLogManagerDlg::AdjustControls(float dScaleX, float dScaleY)
{
CWnd* pWnd = GetWindow(GW_CHILD);
while (pWnd) {
- UINT nCtrlID = pWnd->GetDlgCtrlID();
+ int nCtrlID = pWnd->GetDlgCtrlID();
+ if (nCtrlID != -1 && m_mapCtrlLayouts.find(nCtrlID) != m_mapCtrlLayouts.end())
+ {
+ CRect originalRect = m_mapCtrlLayouts[nCtrlID];
+ CRect newRect(
+ static_cast<int>(originalRect.left * dScaleX),
+ static_cast<int>(originalRect.top * dScaleY),
+ static_cast<int>(originalRect.right * dScaleX),
+ static_cast<int>(originalRect.bottom * dScaleY));
- CRect ctrlRect;
- pWnd->GetWindowRect(&ctrlRect);
- ScreenToClient(&ctrlRect);
+ TCHAR szClassName[256];
+ GetClassName(pWnd->m_hWnd, szClassName, sizeof(szClassName));
- // 璁＄畻鎺т欢鐨勬柊浣嶇疆鍜屽ぇ灏忥紝鎸夋瘮渚嬭皟鏁�
- int newX = (int)(ctrlRect.left * (nWidth / (float)m_nInitialWidth));
- int newY = (int)(ctrlRect.top * (nHeight / (float)m_nInitialHeight));
- int newWidth = (int)(ctrlRect.Width() * (nWidth / (float)m_nInitialWidth));
- int newHeight = (int)(ctrlRect.Height() * (nHeight / (float)m_nInitialHeight));
+ if (_tcsicmp(szClassName, _T("ComboBox")) == 0) {
+ CComboBox* pComboBox = (CComboBox*)pWnd;
+ pComboBox->SetItemHeight(-1, newRect.Height()); // -1 琛ㄧず鎵�鏈夐」鐨勯珮搴�
+ }
- TCHAR szClassName[256];
- GetClassName(pWnd->m_hWnd, szClassName, sizeof(szClassName));
+ if (_tcsicmp(szClassName, _T("MFCGridCtrl")) == 0) {
+ CGridCtrl* pGridCtrl = (CGridCtrl*)pWnd;
+ pGridCtrl->SetDefCellHeight(newRect.Height() / 21);
+ pGridCtrl->ExpandColumnsToFit(TRUE);
+ pGridCtrl->ExpandLastColumn();
+ pGridCtrl->Invalidate();
+ pGridCtrl->UpdateWindow();
+ }
-
- if (_tcsicmp(szClassName, _T("MFCGridCtrl")) == 0) {
- CGridCtrl* pGridCtrl = (CGridCtrl*)pWnd;
- pGridCtrl->SetDefCellHeight(newHeight / 21);
- pGridCtrl->ExpandColumnsToFit(TRUE);
- pGridCtrl->Invalidate();
+ pWnd->MoveWindow(&newRect);
+ AdjustControlFont(pWnd, newRect.Width(), newRect.Height());
}
-
- pWnd->MoveWindow(newX, newY, newWidth, newHeight);
- AdjustControlFont(pWnd, newWidth, newHeight);
-
- // 鑾峰彇涓嬩竴涓帶浠�
pWnd = pWnd->GetNextWindow();
}
}
@@ -231,32 +250,20 @@
TCHAR szClassName[256];
GetClassName(pWnd->m_hWnd, szClassName, sizeof(szClassName));
- if (_tcsicmp(szClassName, _T("Static")) == 0) {
- CStatic* pStatic = (CStatic*)pWnd;
- pStatic->ModifyStyle(SS_CENTER | SS_RIGHT | SS_CENTERIMAGE, SS_LEFT | SS_CENTERIMAGE);
- return;
- }
-
- if (_tcsicmp(szClassName, _T("ComboBox")) == 0) {
- CComboBox* pComboBox = (CComboBox*)pWnd;
- pComboBox->SetItemHeight(-1, nHeight); // -1 琛ㄧず鎵�鏈夐」鐨勯珮搴�
- }
-
+ // 璺宠繃鐗规畩鎺т欢锛堝 MFCGridCtrl锛�
if (_tcsicmp(szClassName, _T("MFCGridCtrl")) == 0) {
return;
}
- int fontSize = nHeight - 10;
- CFont* pCurrentFont = pWnd->GetFont();
- LOGFONT logFont;
- pCurrentFont->GetLogFont(&logFont);
- logFont.lfHeight = -fontSize;
+ // 鏍规嵁鎺т欢楂樺害鍔ㄦ�佽皟鏁村瓧浣撳ぇ灏�
+ int fontSize = nHeight / 2;
+ if (fontSize < 8) fontSize = 8;
- CFont newFont;
- newFont.CreateFontIndirect(&logFont);
+ // 鑾峰彇鎴栧垱寤哄瓧浣�
+ CFont* pFont = GetOrCreateFont(fontSize);
- pWnd->SetFont(&newFont);
- pWnd->Invalidate();
+ pWnd->SetFont(pFont);
+ pWnd->Invalidate(); // 鍒锋柊鎺т欢鏄剧ず
}
@@ -285,6 +292,7 @@
ON_CBN_SELCHANGE(IDC_COMBO_TYPE, &CSystemLogManagerDlg::OnSelchangeComboType)
ON_CBN_SELCHANGE(IDC_COMBO_USER, &CSystemLogManagerDlg::OnSelchangeComboUser)
ON_WM_SIZE()
+ ON_WM_GETMINMAXINFO()
END_MESSAGE_MAP()
@@ -327,6 +335,34 @@
m_nInitialWidth = clientRect.Width();
m_nInitialHeight = clientRect.Height();
+ // 鍒濆鍖栭粯璁ゅ瓧浣�
+ CFont* pDefaultFont = GetOrCreateFont(12);
+
+ // 閬嶅巻鎵�鏈夊瓙鎺т欢锛岃褰曞垵濮嬩綅缃苟璁剧疆榛樿瀛椾綋
+ CWnd* pWnd = GetWindow(GW_CHILD);
+ while (pWnd) {
+ int nCtrlID = pWnd->GetDlgCtrlID();
+ if (nCtrlID != -1) {
+ // 璁板綍鎺т欢鍒濆甯冨眬
+ CRect ctrlRect;
+ pWnd->GetWindowRect(&ctrlRect);
+ ScreenToClient(&ctrlRect);
+ m_mapCtrlLayouts[nCtrlID] = ctrlRect;
+
+ // 璺宠繃鐗规畩鎺т欢锛堝 MFCGridCtrl锛�
+ TCHAR szClassName[256];
+ GetClassName(pWnd->m_hWnd, szClassName, sizeof(szClassName));
+ if (_tcsicmp(szClassName, _T("MFCGridCtrl")) == 0) {
+ pWnd = pWnd->GetNextWindow();
+ continue;
+ }
+
+ // 璁剧疆榛樿瀛椾綋
+ pWnd->SetFont(pDefaultFont);
+ }
+ pWnd = pWnd->GetNextWindow();
+ }
+
GetWindowRect(&dlgRect);
int dlgWidth = dlgRect.Width() * 2;
int dlgHeight = dlgRect.Height() * 2;
@@ -355,12 +391,25 @@
CDialogEx::OnSize(nType, cx, cy);
// TODO: 鍦ㄦ澶勬坊鍔犳秷鎭鐞嗙▼搴忎唬鐮�
- CRect rect;
- GetClientRect(&rect);
+ if (nType == SIZE_MINIMIZED || m_mapCtrlLayouts.empty()) {
+ return;
+ }
+
+ float dScaleX = static_cast<float>(cx) / m_nInitialWidth;
+ float dScaleY = static_cast<float>(cy) / m_nInitialHeight;
// 閬嶅巻瀵硅瘽妗嗕腑鐨勬墍鏈夋帶浠�
- AdjustControls(rect.Width(), rect.Height());
- //SetDefaultFont();
+ AdjustControls(dScaleX, dScaleY);
+}
+
+
+void CSystemLogManagerDlg::OnGetMinMaxInfo(MINMAXINFO* lpMMI)
+{
+ // TODO: 鍦ㄦ娣诲姞娑堟伅澶勭悊绋嬪簭浠ｇ爜鍜�/鎴栬皟鐢ㄩ粯璁ゅ��
+ lpMMI->ptMinTrackSize.x = 400; // 鏈�灏忓搴�
+ lpMMI->ptMinTrackSize.y = 300; // 鏈�灏忛珮搴�
+
+ CDialogEx::OnGetMinMaxInfo(lpMMI);
}
--
Gitblit v1.9.3