删除了CTrafficMonitorDlg类中的m_font成员，绘制主窗口时使用CSkin类中的m_font成员作为字体；皮肤预览界面中的字体和用户设置的字体一致

Author: zhongyang219

TrafficMonitor/CommonData.h

@@ -128,7 +128,7 @@ struct FontInfo
     bool operator==(const FontInfo& a) const;
 
     //创建一个CFont对象
-    void Create(CFont& font, int dpi = 0)
+    void Create(CFont& font, int dpi = 0) const
     {
         font.CreateFont(
             FontSizeToLfHeight(size, dpi), // nHeight

TrafficMonitor/SkinAutoAdaptSettingDlg.cpp

@@ -12,9 +12,8 @@
 
 IMPLEMENT_DYNAMIC(CSkinAutoAdaptSettingDlg, CBaseDialog)
 
-CSkinAutoAdaptSettingDlg::CSkinAutoAdaptSettingDlg(const vector<wstring>& skins, CWnd* pParent /*=nullptr*/)
+CSkinAutoAdaptSettingDlg::CSkinAutoAdaptSettingDlg(CWnd* pParent /*=nullptr*/)
 	: CBaseDialog(IDD_SKIN_AUTO_ADAPT_DLG, pParent)
-    , m_skins(skins)
 {
 
 }
@@ -23,16 +22,6 @@ CSkinAutoAdaptSettingDlg::~CSkinAutoAdaptSettingDlg()
 {
 }
 
-int CSkinAutoAdaptSettingDlg::FindSkinIndex(const wstring& skin_name)
-{
-    std::wstring _skin_name{ skin_name };
-    CSkinManager::SkinNameNormalize(_skin_name);
-    auto iter = std::find(m_skins.begin(), m_skins.end(), _skin_name);
-    if (iter == m_skins.end())
-        return 0;
-    return iter - m_skins.begin();
-}
-
 void CSkinAutoAdaptSettingDlg::DoDataExchange(CDataExchange* pDX)
 {
     CBaseDialog::DoDataExchange(pDX);
@@ -69,14 +58,14 @@ BOOL CSkinAutoAdaptSettingDlg::OnInitDialog()
     CBaseDialog::OnInitDialog();
 
     //初始化下拉列表
-    for (const auto& skin_name : m_skins)
+    for (const auto& skin_name : CSkinManager::Instance().GetSkinNames())
     {
         m_dark_mode_skin_combo.AddString(skin_name.c_str());
         m_light_mode_skin_combo.AddString(skin_name.c_str());
     }
 
-    int dark_mode_skin = FindSkinIndex(theApp.m_cfg_data.skin_name_dark_mode);
-    int light_mode_skin = FindSkinIndex(theApp.m_cfg_data.skin_name_light_mode);
+    int dark_mode_skin = CSkinManager::Instance().FindSkinIndex(theApp.m_cfg_data.skin_name_dark_mode);
+    int light_mode_skin = CSkinManager::Instance().FindSkinIndex(theApp.m_cfg_data.skin_name_light_mode);
     m_dark_mode_skin_combo.SetCurSel(dark_mode_skin);
     m_light_mode_skin_combo.SetCurSel(light_mode_skin);
 

TrafficMonitor/SkinAutoAdaptSettingDlg.h

@@ -9,7 +9,7 @@ class CSkinAutoAdaptSettingDlg : public CBaseDialog
 	DECLARE_DYNAMIC(CSkinAutoAdaptSettingDlg)
 
 public:
-	CSkinAutoAdaptSettingDlg(const vector<wstring>& skins, CWnd* pParent = nullptr);   // 标准构造函数
+	CSkinAutoAdaptSettingDlg(CWnd* pParent = nullptr);   // 标准构造函数
 	virtual ~CSkinAutoAdaptSettingDlg();
 
     int GetDarkModeSkin() const { return m_dark_mode_skin; }
@@ -21,10 +21,6 @@ class CSkinAutoAdaptSettingDlg : public CBaseDialog
 #endif
 
 private:
-    int FindSkinIndex(const wstring& skin_name);
-
-private:
-    const vector<wstring>& m_skins;
     CComboBox m_dark_mode_skin_combo;
     CComboBox m_light_mode_skin_combo;
 

TrafficMonitor/SkinDlg.cpp

@@ -6,6 +6,7 @@
 #include "SkinDlg.h"
 #include "afxdialogex.h"
 #include "SkinAutoAdaptSettingDlg.h"
+#include "SkinManager.h"
 
 
 // CSkinDlg 对话框
@@ -57,7 +58,13 @@ void CSkinDlg::DoDataExchange(CDataExchange* pDX)
 void CSkinDlg::ShowPreview()
 {
     //载入布局数据
-    m_skin_data.Load(m_skins[m_skin_selected]);
+    m_skin_data.Load(CSkinManager::Instance().GetSkinName(m_skin_selected));
+    //获取当前皮肤中用户更改字体
+    SkinSettingData cur_skin_data;
+    if (CSkinManager::Instance().GetSkinSettingDataByIndex(m_skin_selected, cur_skin_data))
+    {
+        m_skin_data.SetFont(cur_skin_data.font);
+    }
     //获取预览区大小
     m_view->SetSize(m_skin_data.GetPreviewInfo().width, m_skin_data.GetPreviewInfo().height);
     //刷新预览图
@@ -112,7 +119,7 @@ BOOL CSkinDlg::OnInitDialog()
     SetIcon(theApp.GetMenuIcon(IDI_SKIN), FALSE);		// 设置小图标
     //初始化选择框
     m_skin_list_box.SetItemHeight(0, DPI(18));
-    for (const auto& skin_name : m_skins)
+    for (const auto& skin_name : CSkinManager::Instance().GetSkinNames())
     {
         m_skin_list_box.AddString(skin_name.c_str());
     }
@@ -122,7 +129,6 @@ BOOL CSkinDlg::OnInitDialog()
     m_view->Create(NULL, NULL, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_HSCROLL, CalculateViewRect(), this, 3000);
     m_view->InitialUpdate();
     m_view->SetSkinData(&m_skin_data);
-    m_view->SetFont(m_pFont);
     m_view->ShowWindow(SW_SHOW);
 
     //设置提示信息
@@ -179,15 +185,16 @@ afx_msg LRESULT CSkinDlg::OnLinkClicked(WPARAM wParam, LPARAM lParam)
 
 void CSkinDlg::OnBnClickedSkinAutoAdaptButton()
 {
-    CSkinAutoAdaptSettingDlg dlg(m_skins);
+    CSkinAutoAdaptSettingDlg dlg;
+    const auto& skins{ CSkinManager::Instance().GetSkinNames() };
     if (dlg.DoModal() == IDOK)
     {
         int dark_mode_skin = dlg.GetDarkModeSkin();
         int light_mode_skin = dlg.GetLightModeSkin();
-        if (dark_mode_skin >= 0 && dark_mode_skin < static_cast<int>(m_skins.size()))
-            theApp.m_cfg_data.skin_name_dark_mode = m_skins[dark_mode_skin];
-        if (light_mode_skin >= 0 && light_mode_skin < static_cast<int>(m_skins.size()))
-            theApp.m_cfg_data.skin_name_light_mode = m_skins[light_mode_skin];
+        if (dark_mode_skin >= 0 && dark_mode_skin < static_cast<int>(skins.size()))
+            theApp.m_cfg_data.skin_name_dark_mode = skins[dark_mode_skin];
+        if (light_mode_skin >= 0 && light_mode_skin < static_cast<int>(skins.size()))
+            theApp.m_cfg_data.skin_name_light_mode = skins[light_mode_skin];
     }
 }
 

TrafficMonitor/SkinDlg.h

@@ -16,9 +16,7 @@ class CSkinDlg : public CBaseDialog
     CSkinDlg(CWnd* pParent = NULL);   // 标准构造函数
     virtual ~CSkinDlg();
 
-    vector<wstring> m_skins;		//皮肤文件的路径
     int m_skin_selected;			//选择的皮肤
-    CFont* m_pFont;		//预览图的字体
 
 // 对话框数据
 #ifdef AFX_DESIGN_TIME