修正插件非自绘的情况下没有通过EI_DRAW_TASKBAR_WND向插件传递是否绘制任务栏窗口的问题

Author: zhongyang219

TrafficMonitor/SkinFile.cpp

@@ -515,14 +515,17 @@ void CSkinFile::DrawPreview(CDC* pDC, CRect rect)
                 point.SetPoint(layout_item.x, layout_item.y);
                 point.Offset(pos.x, pos.y);
                 CRect rect(point, CSize(layout_item.width, m_layout_info.text_height));
+                ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(plugin_item);
+                if (plugin != nullptr && plugin->GetAPIVersion() >= 2)
+                {
+                    plugin->OnExtenedInfo(ITMPlugin::EI_DRAW_TASKBAR_WND, L"0");
+                }
                 if (plugin_item->IsCustomDraw())
                 {
                     int brightness{ (GetRValue(cl) + GetGValue(cl) + GetBValue(cl)) / 2 };
-                    ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(plugin_item);
                     if (plugin != nullptr && plugin->GetAPIVersion() >= 2)
                     {
                         plugin->OnExtenedInfo(ITMPlugin::EI_VALUE_TEXT_COLOR, std::to_wstring(cl).c_str());
-                        plugin->OnExtenedInfo(ITMPlugin::EI_DRAW_TASKBAR_WND, L"0");
                     }
                     draw.GetDC()->SetTextColor(cl);
                     plugin_item->DrawItem(draw.GetDC()->GetSafeHdc(), point.x, point.y, layout_item.width, m_layout_info.text_height, brightness >= 128);
@@ -726,14 +729,18 @@ void CSkinFile::DrawItemsInfo(IDrawCommon& drawer, Layout& layout, CFont& font)
                 cl = iter->second;
             else if (!text_colors.empty())
                 cl = text_colors.begin()->second;
+            ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(plugin_item);
+            if (plugin != nullptr && plugin->GetAPIVersion() >= 2)
+            {
+                plugin->OnExtenedInfo(ITMPlugin::EI_DRAW_TASKBAR_WND, L"0");
+            }
             if (plugin_item->IsCustomDraw())
             {
                 int brightness{ (GetRValue(cl) + GetGValue(cl) + GetBValue(cl)) / 2 };
                 ITMPlugin* plugin = theApp.m_plugins.GetPluginByItem(plugin_item);
                 if (plugin != nullptr && plugin->GetAPIVersion() >= 2)
                 {
                     plugin->OnExtenedInfo(ITMPlugin::EI_VALUE_TEXT_COLOR, std::to_wstring(cl).c_str());
-                    plugin->OnExtenedInfo(ITMPlugin::EI_DRAW_TASKBAR_WND, L"0");
                 }
                 drawer.GetDC()->SetTextColor(cl);
                 drawer.GetDC()->SetBkMode(TRANSPARENT);

TrafficMonitor/TaskBarDlg.cpp

@@ -521,6 +521,10 @@ void CTaskBarDlg::DrawPluginItem(IDrawCommon& drawer, IPluginItem* item, CRect r
         value_text_color = theApp.m_taskbar_data.text_colors.begin()->second.label;
     }
 
+    if (plugin != nullptr && plugin->GetAPIVersion() >= 2)
+    {
+        plugin->OnExtenedInfo(ITMPlugin::EI_DRAW_TASKBAR_WND, L"1");
+    }
     if (item->IsCustomDraw())
     {
         //根据背景色的亮度判断深色还是浅色模式
@@ -531,7 +535,6 @@ void CTaskBarDlg::DrawPluginItem(IDrawCommon& drawer, IPluginItem* item, CRect r
         {
             plugin->OnExtenedInfo(ITMPlugin::EI_LABEL_TEXT_COLOR, std::to_wstring(label_text_color).c_str());
             plugin->OnExtenedInfo(ITMPlugin::EI_VALUE_TEXT_COLOR, std::to_wstring(value_text_color).c_str());
-            plugin->OnExtenedInfo(ITMPlugin::EI_DRAW_TASKBAR_WND, L"1");
         }
         drawer.SetTextColor(value_text_color);
         //需要rtti