CommonDisplayItem由结构体改成类，成员变量改为私有

zhongyang219 · zhongyang219 · commit 2e1b1a1b1bed · 2025-06-29T21:52:26.000+08:00
diff --git a/TrafficMonitor/DisplayItem.cpp b/TrafficMonitor/DisplayItem.cpp
@@ -38,6 +38,21 @@ bool CommonDisplayItem::operator==(const CommonDisplayItem& item) const
         return plugin_item == item.plugin_item;
 }
 
+bool CommonDisplayItem::IsPlugin() const
+{
+    return is_plugin;
+}
+
+DisplayItem CommonDisplayItem::ItemType() const
+{
+    return item_type;
+}
+
+IPluginItem* CommonDisplayItem::PluginItem() const
+{
+    return plugin_item;
+}
+
 CString CommonDisplayItem::GetItemName() const
 {
     if (is_plugin)
diff --git a/TrafficMonitor/DisplayItem.h b/TrafficMonitor/DisplayItem.h
@@ -30,19 +30,25 @@ const std::set<DisplayItem> AllDisplayItems
 };
 
 //显示的项目
-struct CommonDisplayItem
+class CommonDisplayItem
 {
-    bool is_plugin{};           //是否为插件项目
-    DisplayItem item_type{};    //内建的显示项目
-    IPluginItem* plugin_item{}; //插件显示项目
-
+public:
     CommonDisplayItem() {}
     CommonDisplayItem(DisplayItem item);
     CommonDisplayItem(IPluginItem* item);
 
     bool operator<(const CommonDisplayItem&) const;
     bool operator==(const CommonDisplayItem&) const;
 
+    //是否为插件项目
+    bool IsPlugin() const;
+
+    //获取内置的显示项目
+    DisplayItem ItemType() const;
+
+    //获取插件显示项目
+    IPluginItem* PluginItem() const;
+
     //获取显示项目的名称
     CString GetItemName() const;
 
@@ -65,6 +71,11 @@ struct CommonDisplayItem
      * @return  示例文本
      */
     CString GetItemValueSampleText(bool is_main_window) const;
+
+private:
+    bool is_plugin{};           //是否为插件项目
+    DisplayItem item_type{};    //内置的显示项目
+    IPluginItem* plugin_item{}; //插件显示项目
 };
 
 
diff --git a/TrafficMonitor/SetItemOrderDlg.cpp b/TrafficMonitor/SetItemOrderDlg.cpp
@@ -115,31 +115,31 @@ void CSetItemOrderDlg::EnableDlgCtrl(UINT id, bool enable)
 
 bool CSetItemOrderDlg::GetItemChecked(CommonDisplayItem item)
 {
-    if (item.is_plugin)
+    if (item.IsPlugin())
     {
-        if (item.plugin_item != nullptr)
-            return m_plugin_item.Contains(item.plugin_item->GetItemId());
+        if (item.PluginItem() != nullptr)
+            return m_plugin_item.Contains(item.PluginItem()->GetItemId());
     }
     else
     {
-        return m_display_item.Contains(item.item_type);
+        return m_display_item.Contains(item.ItemType());
     }
     return false;
 }
 
 void CSetItemOrderDlg::SaveItemChecked(CommonDisplayItem item, bool checked)
 {
-    if (item.is_plugin)
+    if (item.IsPlugin())
     {
-        if (item.plugin_item != nullptr)
-            m_plugin_item.SetStrContained(item.plugin_item->GetItemId(), checked);
+        if (item.PluginItem() != nullptr)
+            m_plugin_item.SetStrContained(item.PluginItem()->GetItemId(), checked);
     }
     else
     {
         if (checked)
-            m_display_item.Add(item.item_type);
+            m_display_item.Add(item.ItemType());
         else
-            m_display_item.Remove(item.item_type);
+            m_display_item.Remove(item.ItemType());
     }
 }
 
diff --git a/TrafficMonitor/SettingsHelper.cpp b/TrafficMonitor/SettingsHelper.cpp
@@ -132,7 +132,7 @@ void CSettingsHelper::SaveDisplayStr(const wchar_t* AppName, const DispStrings&
 {
     for (const auto& item : disp_str.GetAllItems())
     {
-        if (!item.first.is_plugin)
+        if (!item.first.IsPlugin())
         {
             WriteString(AppName, item.first.GetItemIniKeyName(), item.second);
         }
diff --git a/TrafficMonitor/SkinFile.cpp b/TrafficMonitor/SkinFile.cpp
@@ -429,18 +429,18 @@ void CSkinFile::DrawPreview(CDC* pDC, CRect rect)
     std::map<DisplayItem, DrawStr> map_str;
     for (auto iter = all_skin_items.begin(); iter != all_skin_items.end(); ++iter)
     {
-        if (iter->is_plugin)
+        if (iter->IsPlugin())
             continue;
         DrawStr draw_str;
-        draw_str.value = CommonDisplayItem(iter->item_type).GetItemValueSampleText(true);
+        draw_str.value = CommonDisplayItem(iter->ItemType()).GetItemValueSampleText(true);
         if (!m_layout_info.no_label)
         {
             if (m_setting_data.disp_str.IsInvalid())
                 draw_str.label = iter->DefaultString(true).c_str();
             else
                 draw_str.label = m_setting_data.disp_str.GetConst(*iter).c_str();
         }
-        map_str[iter->item_type] = draw_str;
+        map_str[iter->ItemType()] = draw_str;
     }
 
     //获取文本颜色
diff --git a/TrafficMonitor/TaskBarDlg.cpp b/TrafficMonitor/TaskBarDlg.cpp
@@ -201,10 +201,10 @@ void CTaskBarDlg::ShowInfo(CDC* pDC)
                     item_rect.MoveToX(item_rect.right + DPI(theApp.m_taskbar_data.item_space));
                 item_rect.right = item_rect.left + iter->item_width.TotalWidth();
                 item_rect.bottom = item_rect.top + m_window_height;
-                if (iter->is_plugin)
-                    DrawPluginItem(draw, iter->plugin_item, item_rect, iter->item_width.label_width);
+                if (iter->IsPlugin())
+                    DrawPluginItem(draw, iter->PluginItem(), item_rect, iter->item_width.label_width);
                 else
-                    DrawDisplayItem(draw, iter->item_type, item_rect, iter->item_width.label_width);
+                    DrawDisplayItem(draw, iter->ItemType(), item_rect, iter->item_width.label_width);
             }
             else //非水平排列时，每两个一组显示
             {
@@ -223,25 +223,25 @@ void CTaskBarDlg::ShowInfo(CDC* pDC)
                     item_rect.right = item_rect.left + width;
                     item_rect_up.right = item_rect_up.left + width;
                     //绘制信息
-                    if (last_iter->is_plugin)
-                        DrawPluginItem(draw, last_iter->plugin_item, item_rect_up, last_item_width.label_width);
+                    if (last_iter->IsPlugin())
+                        DrawPluginItem(draw, last_iter->PluginItem(), item_rect_up, last_item_width.label_width);
                     else
-                        DrawDisplayItem(draw, last_iter->item_type, item_rect_up, last_item_width.label_width);
-                    if (iter->is_plugin)
-                        DrawPluginItem(draw, iter->plugin_item, item_rect, iter->item_width.label_width);
+                        DrawDisplayItem(draw, last_iter->ItemType(), item_rect_up, last_item_width.label_width);
+                    if (iter->IsPlugin())
+                        DrawPluginItem(draw, iter->PluginItem(), item_rect, iter->item_width.label_width);
                     else
-                        DrawDisplayItem(draw, iter->item_type, item_rect, iter->item_width.label_width);
+                        DrawDisplayItem(draw, iter->ItemType(), item_rect, iter->item_width.label_width);
                 }
                 //要绘制的项目为奇数时绘制最后一个
                 else if (item_count % 2 == 1 && index == item_count - 1)
                 {
                     item_rect.MoveToXY(item_rect.right + DPI(theApp.m_taskbar_data.item_space), 0);
                     item_rect.bottom = TASKBAR_WND_HEIGHT;
                     item_rect.right = item_rect.left + iter->item_width.MaxWidth();
-                    if (iter->is_plugin)
-                        DrawPluginItem(draw, iter->plugin_item, item_rect, iter->item_width.label_width, true);
+                    if (iter->IsPlugin())
+                        DrawPluginItem(draw, iter->PluginItem(), item_rect, iter->item_width.label_width, true);
                     else
-                        DrawDisplayItem(draw, iter->item_type, item_rect, iter->item_width.label_width, true);
+                        DrawDisplayItem(draw, iter->ItemType(), item_rect, iter->item_width.label_width, true);
                 }
             }
         }
@@ -252,10 +252,10 @@ void CTaskBarDlg::ShowInfo(CDC* pDC)
                 item_rect.MoveToXY(0, item_rect.bottom + DPI(theApp.m_taskbar_data.item_space));
             item_rect.bottom = item_rect.top + TASKBAR_WND_HEIGHT / 2;
             item_rect.right = item_rect.left + min(m_window_width, m_rcTaskbar.Width() - DPI(theApp.m_taskbar_data.item_space));
-            if (iter->is_plugin)
-                DrawPluginItem(draw, iter->plugin_item, item_rect, iter->item_width.label_width);
+            if (iter->IsPlugin())
+                DrawPluginItem(draw, iter->PluginItem(), item_rect, iter->item_width.label_width);
             else
-                DrawDisplayItem(draw, iter->item_type, item_rect, iter->item_width.label_width);
+                DrawDisplayItem(draw, iter->ItemType(), item_rect, iter->item_width.label_width);
         }
         index++;
         last_iter = iter;
@@ -818,9 +818,9 @@ void CTaskBarDlg::CalculateWindowSize()
     //const auto& item_map = theApp.m_taskbar_data.disp_str.GetAllItems();
     for (auto iter = theApp.m_plugins.AllDisplayItemsWithPlugins().begin(); iter != theApp.m_plugins.AllDisplayItemsWithPlugins().end(); ++iter)
     {
-        if (iter->is_plugin)
+        if (iter->IsPlugin())
         {
-            auto plugin = iter->plugin_item;
+            auto plugin = iter->PluginItem();
             if (plugin != nullptr && theApp.m_taskbar_data.plugin_display_item.Contains(plugin->GetItemId()))
             {
                 //标签宽度
@@ -1063,13 +1063,13 @@ void CTaskBarDlg::OnRButtonUp(UINT nFlags, CPoint point)
     m_menu_popuped = true;
     m_tool_tips.Pop();
     ITMPlugin* plugin{};
-    bool is_plugin_item_clicked = (CheckClickedItem(point) && m_clicked_item.is_plugin && m_clicked_item.plugin_item != nullptr);
+    bool is_plugin_item_clicked = (CheckClickedItem(point) && m_clicked_item.IsPlugin() && m_clicked_item.PluginItem() != nullptr);
     if (is_plugin_item_clicked)
     {
-        plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.plugin_item);
+        plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.PluginItem());
         if (plugin != nullptr && plugin->GetAPIVersion() >= 3)
         {
-            if (m_clicked_item.plugin_item->OnMouseEvent(IPluginItem::MT_RCLICKED, point.x, point.y, (void*)GetSafeHwnd(), IPluginItem::MF_TASKBAR_WND) != 0)
+            if (m_clicked_item.PluginItem()->OnMouseEvent(IPluginItem::MT_RCLICKED, point.x, point.y, (void*)GetSafeHwnd(), IPluginItem::MF_TASKBAR_WND) != 0)
                 return;
         }
     }
@@ -1135,7 +1135,7 @@ void CTaskBarDlg::OnInitMenu(CMenu* pMenu)
     }
 
     //设置插件命令的勾选状态
-    ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.plugin_item);
+    ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.PluginItem());
     if (plugin != nullptr && plugin->GetAPIVersion() >= 5)
     {
         for (int i = ID_PLUGIN_COMMAND_START; i <= ID_PLUGIN_COMMAND_MAX; i++)
@@ -1168,10 +1168,10 @@ BOOL CTaskBarDlg::PreTranslateMessage(MSG* pMsg)
         bool ctrl = (GetKeyState(VK_CONTROL) & 0x80);
         bool shift = (GetKeyState(VK_SHIFT) & 0x8000);
         bool alt = (GetKeyState(VK_MENU) & 0x8000);
-        ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.plugin_item);
+        ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.PluginItem());
         if (plugin != nullptr && plugin->GetAPIVersion() >= 4)
         {
-            if (m_clicked_item.plugin_item->OnKeboardEvent(pMsg->wParam, ctrl, shift, alt, (void*)GetSafeHwnd(), IPluginItem::KF_TASKBAR_WND) != 0)
+            if (m_clicked_item.PluginItem()->OnKeboardEvent(pMsg->wParam, ctrl, shift, alt, (void*)GetSafeHwnd(), IPluginItem::KF_TASKBAR_WND) != 0)
                 return TRUE;
         }
     }
@@ -1189,12 +1189,12 @@ void CTaskBarDlg::OnMouseMove(UINT nFlags, CPoint point)
 void CTaskBarDlg::OnLButtonDblClk(UINT nFlags, CPoint point)
 {
     // TODO: 在此添加消息处理程序代码和/或调用默认值
-    if (CheckClickedItem(point) && m_clicked_item.is_plugin && m_clicked_item.plugin_item != nullptr)
+    if (CheckClickedItem(point) && m_clicked_item.IsPlugin() && m_clicked_item.PluginItem() != nullptr)
     {
-        ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.plugin_item);
+        ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.PluginItem());
         if (plugin != nullptr && plugin->GetAPIVersion() >= 3)
         {
-            if (m_clicked_item.plugin_item->OnMouseEvent(IPluginItem::MT_DBCLICKED, point.x, point.y, (void*)GetSafeHwnd(), IPluginItem::MF_TASKBAR_WND) != 0)
+            if (m_clicked_item.PluginItem()->OnMouseEvent(IPluginItem::MT_DBCLICKED, point.x, point.y, (void*)GetSafeHwnd(), IPluginItem::MF_TASKBAR_WND) != 0)
                 return;
         }
     }
@@ -1275,9 +1275,9 @@ BOOL CTaskBarDlg::OnCommand(WPARAM wParam, LPARAM lParam)
     if (uMsg >= ID_PLUGIN_COMMAND_START && uMsg <= ID_PLUGIN_COMMAND_MAX)
     {
         int index = uMsg - ID_PLUGIN_COMMAND_START;
-        if (m_clicked_item.is_plugin && m_clicked_item.plugin_item != nullptr)
+        if (m_clicked_item.IsPlugin() && m_clicked_item.PluginItem() != nullptr)
         {
-            ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.plugin_item);
+            ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.PluginItem());
             if (plugin != nullptr && plugin->GetAPIVersion() >= 5)
             {
                 plugin->OnPluginCommand(index, (void*)GetSafeHwnd(), nullptr);
@@ -1434,12 +1434,12 @@ void CTaskBarDlg::OnClose()
 void CTaskBarDlg::OnLButtonUp(UINT nFlags, CPoint point)
 {
     // TODO: 在此添加消息处理程序代码和/或调用默认值
-    if (CheckClickedItem(point) && m_clicked_item.is_plugin && m_clicked_item.plugin_item != nullptr)
+    if (CheckClickedItem(point) && m_clicked_item.IsPlugin() && m_clicked_item.PluginItem() != nullptr)
     {
-        ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.plugin_item);
+        ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.PluginItem());
         if (plugin != nullptr && plugin->GetAPIVersion() >= 3)
         {
-            if (m_clicked_item.plugin_item->OnMouseEvent(IPluginItem::MT_LCLICKED, point.x, point.y, (void*)GetSafeHwnd(), IPluginItem::MF_TASKBAR_WND) != 0)
+            if (m_clicked_item.PluginItem()->OnMouseEvent(IPluginItem::MT_LCLICKED, point.x, point.y, (void*)GetSafeHwnd(), IPluginItem::MF_TASKBAR_WND) != 0)
                 return;
         }
     }
@@ -1467,18 +1467,18 @@ BOOL CTaskBarDlg::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt)
         CPoint point = pt;
         ScreenToClient(&point);
         ITMPlugin* plugin{};
-        bool is_plugin_item_clicked = (CheckClickedItem(point) && m_clicked_item.is_plugin && m_clicked_item.plugin_item != nullptr);
+        bool is_plugin_item_clicked = (CheckClickedItem(point) && m_clicked_item.IsPlugin() && m_clicked_item.PluginItem() != nullptr);
         if (is_plugin_item_clicked)
         {
-            plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.plugin_item);
+            plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.PluginItem());
             if (plugin != nullptr && plugin->GetAPIVersion() >= 3)
             {
                 IPluginItem::MouseEventType type;
                 if (zDelta > 0)
                     type = IPluginItem::MT_WHEEL_UP;
                 else
                     type = IPluginItem::MT_WHEEL_DOWN;
-                if (m_clicked_item.plugin_item->OnMouseEvent(type, point.x, point.y, (void*)GetSafeHwnd(), IPluginItem::MF_TASKBAR_WND) != 0)
+                if (m_clicked_item.PluginItem()->OnMouseEvent(type, point.x, point.y, (void*)GetSafeHwnd(), IPluginItem::MF_TASKBAR_WND) != 0)
                     return TRUE;
             }
         }
diff --git a/TrafficMonitor/TaskbarItemOrderHelper.cpp b/TrafficMonitor/TaskbarItemOrderHelper.cpp
@@ -86,7 +86,7 @@ CString CTaskbarItemOrderHelper::GetItemDisplayName(CommonDisplayItem item)
 bool CTaskbarItemOrderHelper::IsItemDisplayed(CommonDisplayItem item)
 {
     bool displayed = true;
-    if (!item.is_plugin)
+    if (!item.IsPlugin())
     {
         if ((item == TDI_CPU_TEMP) && !theApp.m_general_data.IsHardwareEnable(HI_CPU))
             displayed = false;
diff --git a/TrafficMonitor/TrafficMonitor.cpp b/TrafficMonitor/TrafficMonitor.cpp
@@ -1226,14 +1226,14 @@ std::wstring CTrafficMonitorApp::GetPlauginTooltipInfo() const
 
 bool CTrafficMonitorApp::IsTaksbarItemDisplayed(CommonDisplayItem item) const
 {
-    if (item.is_plugin)
+    if (item.IsPlugin())
     {
-        if (item.plugin_item != nullptr)
-            return m_taskbar_data.plugin_display_item.Contains(item.plugin_item->GetItemId());
+        if (item.PluginItem() != nullptr)
+            return m_taskbar_data.plugin_display_item.Contains(item.PluginItem()->GetItemId());
     }
     else
     {
-        return m_taskbar_data.display_item.Contains(item.item_type);
+        return m_taskbar_data.display_item.Contains(item.ItemType());
     }
     return false;
 }
diff --git a/TrafficMonitor/TrafficMonitorDlg.cpp b/TrafficMonitor/TrafficMonitorDlg.cpp

Original file line number	Diff line number	Diff line change
`@@ -115,31 +115,31 @@ void CSetItemOrderDlg::EnableDlgCtrl(UINT id, bool enable)`
`115`	`115`
`116`	`116`	`bool CSetItemOrderDlg::GetItemChecked(CommonDisplayItem item)`
`117`	`117`	`{`
`118`		`- if (item.is_plugin)`
	`118`	`+ if (item.IsPlugin())`
`119`	`119`	`{`
`120`		`- if (item.plugin_item != nullptr)`
`121`		`- return m_plugin_item.Contains(item.plugin_item->GetItemId());`
	`120`	`+ if (item.PluginItem() != nullptr)`
	`121`	`+ return m_plugin_item.Contains(item.PluginItem()->GetItemId());`
`122`	`122`	`}`
`123`	`123`	`else`
`124`	`124`	`{`
`125`		`- return m_display_item.Contains(item.item_type);`
	`125`	`+ return m_display_item.Contains(item.ItemType());`
`126`	`126`	`}`
`127`	`127`	`return false;`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`void CSetItemOrderDlg::SaveItemChecked(CommonDisplayItem item, bool checked)`
`131`	`131`	`{`
`132`		`- if (item.is_plugin)`
	`132`	`+ if (item.IsPlugin())`
`133`	`133`	`{`
`134`		`- if (item.plugin_item != nullptr)`
`135`		`- m_plugin_item.SetStrContained(item.plugin_item->GetItemId(), checked);`
	`134`	`+ if (item.PluginItem() != nullptr)`
	`135`	`+ m_plugin_item.SetStrContained(item.PluginItem()->GetItemId(), checked);`
`136`	`136`	`}`
`137`	`137`	`else`
`138`	`138`	`{`
`139`	`139`	`if (checked)`
`140`		`- m_display_item.Add(item.item_type);`
	`140`	`+ m_display_item.Add(item.ItemType());`
`141`	`141`	`else`
`142`		`- m_display_item.Remove(item.item_type);`
	`142`	`+ m_display_item.Remove(item.ItemType());`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ void CSettingsHelper::SaveDisplayStr(const wchar_t* AppName, const DispStrings&`
`132`	`132`	`{`
`133`	`133`	`for (const auto& item : disp_str.GetAllItems())`
`134`	`134`	`{`
`135`		`- if (!item.first.is_plugin)`
	`135`	`+ if (!item.first.IsPlugin())`
`136`	`136`	`{`
`137`	`137`	`WriteString(AppName, item.first.GetItemIniKeyName(), item.second);`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -429,18 +429,18 @@ void CSkinFile::DrawPreview(CDC* pDC, CRect rect)`
`429`	`429`	`std::map<DisplayItem, DrawStr> map_str;`
`430`	`430`	`for (auto iter = all_skin_items.begin(); iter != all_skin_items.end(); ++iter)`
`431`	`431`	`{`
`432`		`- if (iter->is_plugin)`
	`432`	`+ if (iter->IsPlugin())`
`433`	`433`	`continue;`
`434`	`434`	`DrawStr draw_str;`
`435`		`- draw_str.value = CommonDisplayItem(iter->item_type).GetItemValueSampleText(true);`
	`435`	`+ draw_str.value = CommonDisplayItem(iter->ItemType()).GetItemValueSampleText(true);`
`436`	`436`	`if (!m_layout_info.no_label)`
`437`	`437`	`{`
`438`	`438`	`if (m_setting_data.disp_str.IsInvalid())`
`439`	`439`	`draw_str.label = iter->DefaultString(true).c_str();`
`440`	`440`	`else`
`441`	`441`	`draw_str.label = m_setting_data.disp_str.GetConst(*iter).c_str();`
`442`	`442`	`}`
`443`		`- map_str[iter->item_type] = draw_str;`
	`443`	`+ map_str[iter->ItemType()] = draw_str;`
`444`	`444`	`}`
`445`	`445`
`446`	`446`	`//获取文本颜色`
Original file line number	Diff line number	Diff line change
`@@ -201,10 +201,10 @@ void CTaskBarDlg::ShowInfo(CDC* pDC)`
`201`	`201`	`item_rect.MoveToX(item_rect.right + DPI(theApp.m_taskbar_data.item_space));`
`202`	`202`	`item_rect.right = item_rect.left + iter->item_width.TotalWidth();`
`203`	`203`	`item_rect.bottom = item_rect.top + m_window_height;`
`204`		`- if (iter->is_plugin)`
`205`		`- DrawPluginItem(draw, iter->plugin_item, item_rect, iter->item_width.label_width);`
	`204`	`+ if (iter->IsPlugin())`
	`205`	`+ DrawPluginItem(draw, iter->PluginItem(), item_rect, iter->item_width.label_width);`
`206`	`206`	`else`
`207`		`- DrawDisplayItem(draw, iter->item_type, item_rect, iter->item_width.label_width);`
	`207`	`+ DrawDisplayItem(draw, iter->ItemType(), item_rect, iter->item_width.label_width);`
`208`	`208`	`}`
`209`	`209`	`else //非水平排列时，每两个一组显示`
`210`	`210`	`{`
`@@ -223,25 +223,25 @@ void CTaskBarDlg::ShowInfo(CDC* pDC)`
`223`	`223`	`item_rect.right = item_rect.left + width;`
`224`	`224`	`item_rect_up.right = item_rect_up.left + width;`
`225`	`225`	`//绘制信息`
`226`		`- if (last_iter->is_plugin)`
`227`		`- DrawPluginItem(draw, last_iter->plugin_item, item_rect_up, last_item_width.label_width);`
	`226`	`+ if (last_iter->IsPlugin())`
	`227`	`+ DrawPluginItem(draw, last_iter->PluginItem(), item_rect_up, last_item_width.label_width);`
`228`	`228`	`else`
`229`		`- DrawDisplayItem(draw, last_iter->item_type, item_rect_up, last_item_width.label_width);`
`230`		`- if (iter->is_plugin)`
`231`		`- DrawPluginItem(draw, iter->plugin_item, item_rect, iter->item_width.label_width);`
	`229`	`+ DrawDisplayItem(draw, last_iter->ItemType(), item_rect_up, last_item_width.label_width);`
	`230`	`+ if (iter->IsPlugin())`
	`231`	`+ DrawPluginItem(draw, iter->PluginItem(), item_rect, iter->item_width.label_width);`
`232`	`232`	`else`
`233`		`- DrawDisplayItem(draw, iter->item_type, item_rect, iter->item_width.label_width);`
	`233`	`+ DrawDisplayItem(draw, iter->ItemType(), item_rect, iter->item_width.label_width);`
`234`	`234`	`}`
`235`	`235`	`//要绘制的项目为奇数时绘制最后一个`
`236`	`236`	`else if (item_count % 2 == 1 && index == item_count - 1)`
`237`	`237`	`{`
`238`	`238`	`item_rect.MoveToXY(item_rect.right + DPI(theApp.m_taskbar_data.item_space), 0);`
`239`	`239`	`item_rect.bottom = TASKBAR_WND_HEIGHT;`
`240`	`240`	`item_rect.right = item_rect.left + iter->item_width.MaxWidth();`
`241`		`- if (iter->is_plugin)`
`242`		`- DrawPluginItem(draw, iter->plugin_item, item_rect, iter->item_width.label_width, true);`
	`241`	`+ if (iter->IsPlugin())`
	`242`	`+ DrawPluginItem(draw, iter->PluginItem(), item_rect, iter->item_width.label_width, true);`
`243`	`243`	`else`
`244`		`- DrawDisplayItem(draw, iter->item_type, item_rect, iter->item_width.label_width, true);`
	`244`	`+ DrawDisplayItem(draw, iter->ItemType(), item_rect, iter->item_width.label_width, true);`
`245`	`245`	`}`
`246`	`246`	`}`
`247`	`247`	`}`
`@@ -252,10 +252,10 @@ void CTaskBarDlg::ShowInfo(CDC* pDC)`
`252`	`252`	`item_rect.MoveToXY(0, item_rect.bottom + DPI(theApp.m_taskbar_data.item_space));`
`253`	`253`	`item_rect.bottom = item_rect.top + TASKBAR_WND_HEIGHT / 2;`
`254`	`254`	`item_rect.right = item_rect.left + min(m_window_width, m_rcTaskbar.Width() - DPI(theApp.m_taskbar_data.item_space));`
`255`		`- if (iter->is_plugin)`
`256`		`- DrawPluginItem(draw, iter->plugin_item, item_rect, iter->item_width.label_width);`
	`255`	`+ if (iter->IsPlugin())`
	`256`	`+ DrawPluginItem(draw, iter->PluginItem(), item_rect, iter->item_width.label_width);`
`257`	`257`	`else`
`258`		`- DrawDisplayItem(draw, iter->item_type, item_rect, iter->item_width.label_width);`
	`258`	`+ DrawDisplayItem(draw, iter->ItemType(), item_rect, iter->item_width.label_width);`
`259`	`259`	`}`
`260`	`260`	`index++;`
`261`	`261`	`last_iter = iter;`
`@@ -818,9 +818,9 @@ void CTaskBarDlg::CalculateWindowSize()`
`818`	`818`	`//const auto& item_map = theApp.m_taskbar_data.disp_str.GetAllItems();`
`819`	`819`	`for (auto iter = theApp.m_plugins.AllDisplayItemsWithPlugins().begin(); iter != theApp.m_plugins.AllDisplayItemsWithPlugins().end(); ++iter)`
`820`	`820`	`{`
`821`		`- if (iter->is_plugin)`
	`821`	`+ if (iter->IsPlugin())`
`822`	`822`	`{`
`823`		`- auto plugin = iter->plugin_item;`
	`823`	`+ auto plugin = iter->PluginItem();`
`824`	`824`	`if (plugin != nullptr && theApp.m_taskbar_data.plugin_display_item.Contains(plugin->GetItemId()))`
`825`	`825`	`{`
`826`	`826`	`//标签宽度`
`@@ -1063,13 +1063,13 @@ void CTaskBarDlg::OnRButtonUp(UINT nFlags, CPoint point)`
`1063`	`1063`	`m_menu_popuped = true;`
`1064`	`1064`	`m_tool_tips.Pop();`
`1065`	`1065`	`ITMPlugin* plugin{};`
`1066`		`- bool is_plugin_item_clicked = (CheckClickedItem(point) && m_clicked_item.is_plugin && m_clicked_item.plugin_item != nullptr);`
	`1066`	`+ bool is_plugin_item_clicked = (CheckClickedItem(point) && m_clicked_item.IsPlugin() && m_clicked_item.PluginItem() != nullptr);`
`1067`	`1067`	`if (is_plugin_item_clicked)`
`1068`	`1068`	`{`
`1069`		`- plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.plugin_item);`
	`1069`	`+ plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.PluginItem());`
`1070`	`1070`	`if (plugin != nullptr && plugin->GetAPIVersion() >= 3)`
`1071`	`1071`	`{`
`1072`		`- if (m_clicked_item.plugin_item->OnMouseEvent(IPluginItem::MT_RCLICKED, point.x, point.y, (void*)GetSafeHwnd(), IPluginItem::MF_TASKBAR_WND) != 0)`
	`1072`	`+ if (m_clicked_item.PluginItem()->OnMouseEvent(IPluginItem::MT_RCLICKED, point.x, point.y, (void*)GetSafeHwnd(), IPluginItem::MF_TASKBAR_WND) != 0)`
`1073`	`1073`	`return;`
`1074`	`1074`	`}`
`1075`	`1075`	`}`
`@@ -1135,7 +1135,7 @@ void CTaskBarDlg::OnInitMenu(CMenu* pMenu)`
`1135`	`1135`	`}`
`1136`	`1136`
`1137`	`1137`	`//设置插件命令的勾选状态`
`1138`		`- ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.plugin_item);`
	`1138`	`+ ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.PluginItem());`
`1139`	`1139`	`if (plugin != nullptr && plugin->GetAPIVersion() >= 5)`
`1140`	`1140`	`{`
`1141`	`1141`	`for (int i = ID_PLUGIN_COMMAND_START; i <= ID_PLUGIN_COMMAND_MAX; i++)`
`@@ -1168,10 +1168,10 @@ BOOL CTaskBarDlg::PreTranslateMessage(MSG* pMsg)`
`1168`	`1168`	`bool ctrl = (GetKeyState(VK_CONTROL) & 0x80);`
`1169`	`1169`	`bool shift = (GetKeyState(VK_SHIFT) & 0x8000);`
`1170`	`1170`	`bool alt = (GetKeyState(VK_MENU) & 0x8000);`
`1171`		`- ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.plugin_item);`
	`1171`	`+ ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.PluginItem());`
`1172`	`1172`	`if (plugin != nullptr && plugin->GetAPIVersion() >= 4)`
`1173`	`1173`	`{`
`1174`		`- if (m_clicked_item.plugin_item->OnKeboardEvent(pMsg->wParam, ctrl, shift, alt, (void*)GetSafeHwnd(), IPluginItem::KF_TASKBAR_WND) != 0)`
	`1174`	`+ if (m_clicked_item.PluginItem()->OnKeboardEvent(pMsg->wParam, ctrl, shift, alt, (void*)GetSafeHwnd(), IPluginItem::KF_TASKBAR_WND) != 0)`
`1175`	`1175`	`return TRUE;`
`1176`	`1176`	`}`
`1177`	`1177`	`}`
`@@ -1189,12 +1189,12 @@ void CTaskBarDlg::OnMouseMove(UINT nFlags, CPoint point)`
`1189`	`1189`	`void CTaskBarDlg::OnLButtonDblClk(UINT nFlags, CPoint point)`
`1190`	`1190`	`{`
`1191`	`1191`	`// TODO: 在此添加消息处理程序代码和/或调用默认值`
`1192`		`- if (CheckClickedItem(point) && m_clicked_item.is_plugin && m_clicked_item.plugin_item != nullptr)`
	`1192`	`+ if (CheckClickedItem(point) && m_clicked_item.IsPlugin() && m_clicked_item.PluginItem() != nullptr)`
`1193`	`1193`	`{`
`1194`		`- ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.plugin_item);`
	`1194`	`+ ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.PluginItem());`
`1195`	`1195`	`if (plugin != nullptr && plugin->GetAPIVersion() >= 3)`
`1196`	`1196`	`{`
`1197`		`- if (m_clicked_item.plugin_item->OnMouseEvent(IPluginItem::MT_DBCLICKED, point.x, point.y, (void*)GetSafeHwnd(), IPluginItem::MF_TASKBAR_WND) != 0)`
	`1197`	`+ if (m_clicked_item.PluginItem()->OnMouseEvent(IPluginItem::MT_DBCLICKED, point.x, point.y, (void*)GetSafeHwnd(), IPluginItem::MF_TASKBAR_WND) != 0)`
`1198`	`1198`	`return;`
`1199`	`1199`	`}`
`1200`	`1200`	`}`
`@@ -1275,9 +1275,9 @@ BOOL CTaskBarDlg::OnCommand(WPARAM wParam, LPARAM lParam)`
`1275`	`1275`	`if (uMsg >= ID_PLUGIN_COMMAND_START && uMsg <= ID_PLUGIN_COMMAND_MAX)`
`1276`	`1276`	`{`
`1277`	`1277`	`int index = uMsg - ID_PLUGIN_COMMAND_START;`
`1278`		`- if (m_clicked_item.is_plugin && m_clicked_item.plugin_item != nullptr)`
	`1278`	`+ if (m_clicked_item.IsPlugin() && m_clicked_item.PluginItem() != nullptr)`
`1279`	`1279`	`{`
`1280`		`- ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.plugin_item);`
	`1280`	`+ ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.PluginItem());`
`1281`	`1281`	`if (plugin != nullptr && plugin->GetAPIVersion() >= 5)`
`1282`	`1282`	`{`
`1283`	`1283`	`plugin->OnPluginCommand(index, (void*)GetSafeHwnd(), nullptr);`
`@@ -1434,12 +1434,12 @@ void CTaskBarDlg::OnClose()`
`1434`	`1434`	`void CTaskBarDlg::OnLButtonUp(UINT nFlags, CPoint point)`
`1435`	`1435`	`{`
`1436`	`1436`	`// TODO: 在此添加消息处理程序代码和/或调用默认值`
`1437`		`- if (CheckClickedItem(point) && m_clicked_item.is_plugin && m_clicked_item.plugin_item != nullptr)`
	`1437`	`+ if (CheckClickedItem(point) && m_clicked_item.IsPlugin() && m_clicked_item.PluginItem() != nullptr)`
`1438`	`1438`	`{`
`1439`		`- ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.plugin_item);`
	`1439`	`+ ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.PluginItem());`
`1440`	`1440`	`if (plugin != nullptr && plugin->GetAPIVersion() >= 3)`
`1441`	`1441`	`{`
`1442`		`- if (m_clicked_item.plugin_item->OnMouseEvent(IPluginItem::MT_LCLICKED, point.x, point.y, (void*)GetSafeHwnd(), IPluginItem::MF_TASKBAR_WND) != 0)`
	`1442`	`+ if (m_clicked_item.PluginItem()->OnMouseEvent(IPluginItem::MT_LCLICKED, point.x, point.y, (void*)GetSafeHwnd(), IPluginItem::MF_TASKBAR_WND) != 0)`
`1443`	`1443`	`return;`
`1444`	`1444`	`}`
`1445`	`1445`	`}`
`@@ -1467,18 +1467,18 @@ BOOL CTaskBarDlg::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt)`
`1467`	`1467`	`CPoint point = pt;`
`1468`	`1468`	`ScreenToClient(&point);`
`1469`	`1469`	`ITMPlugin* plugin{};`
`1470`		`- bool is_plugin_item_clicked = (CheckClickedItem(point) && m_clicked_item.is_plugin && m_clicked_item.plugin_item != nullptr);`
	`1470`	`+ bool is_plugin_item_clicked = (CheckClickedItem(point) && m_clicked_item.IsPlugin() && m_clicked_item.PluginItem() != nullptr);`
`1471`	`1471`	`if (is_plugin_item_clicked)`
`1472`	`1472`	`{`
`1473`		`- plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.plugin_item);`
	`1473`	`+ plugin = theApp.m_plugins.GetPluginByItem(m_clicked_item.PluginItem());`
`1474`	`1474`	`if (plugin != nullptr && plugin->GetAPIVersion() >= 3)`
`1475`	`1475`	`{`
`1476`	`1476`	`IPluginItem::MouseEventType type;`
`1477`	`1477`	`if (zDelta > 0)`
`1478`	`1478`	`type = IPluginItem::MT_WHEEL_UP;`
`1479`	`1479`	`else`
`1480`	`1480`	`type = IPluginItem::MT_WHEEL_DOWN;`
`1481`		`- if (m_clicked_item.plugin_item->OnMouseEvent(type, point.x, point.y, (void*)GetSafeHwnd(), IPluginItem::MF_TASKBAR_WND) != 0)`
	`1481`	`+ if (m_clicked_item.PluginItem()->OnMouseEvent(type, point.x, point.y, (void*)GetSafeHwnd(), IPluginItem::MF_TASKBAR_WND) != 0)`
`1482`	`1482`	`return TRUE;`
`1483`	`1483`	`}`
`1484`	`1484`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ CString CTaskbarItemOrderHelper::GetItemDisplayName(CommonDisplayItem item)`
`86`	`86`	`bool CTaskbarItemOrderHelper::IsItemDisplayed(CommonDisplayItem item)`
`87`	`87`	`{`
`88`	`88`	`bool displayed = true;`
`89`		`- if (!item.is_plugin)`
	`89`	`+ if (!item.IsPlugin())`
`90`	`90`	`{`
`91`	`91`	`if ((item == TDI_CPU_TEMP) && !theApp.m_general_data.IsHardwareEnable(HI_CPU))`
`92`	`92`	`displayed = false;`
Original file line number	Diff line number	Diff line change
`@@ -1226,14 +1226,14 @@ std::wstring CTrafficMonitorApp::GetPlauginTooltipInfo() const`
`1226`	`1226`
`1227`	`1227`	`bool CTrafficMonitorApp::IsTaksbarItemDisplayed(CommonDisplayItem item) const`
`1228`	`1228`	`{`
`1229`		`- if (item.is_plugin)`
	`1229`	`+ if (item.IsPlugin())`
`1230`	`1230`	`{`
`1231`		`- if (item.plugin_item != nullptr)`
`1232`		`- return m_taskbar_data.plugin_display_item.Contains(item.plugin_item->GetItemId());`
	`1231`	`+ if (item.PluginItem() != nullptr)`
	`1232`	`+ return m_taskbar_data.plugin_display_item.Contains(item.PluginItem()->GetItemId());`
`1233`	`1233`	`}`
`1234`	`1234`	`else`
`1235`	`1235`	`{`
`1236`		`- return m_taskbar_data.display_item.Contains(item.item_type);`
	`1236`	`+ return m_taskbar_data.display_item.Contains(item.ItemType());`
`1237`	`1237`	`}`
`1238`	`1238`	`return false;`
`1239`	`1239`	`}`