修正更换皮肤后主窗口会有一段时间显示空白的问题

zhongyang219 · Jan 12, 2025 · 729009d · 729009d
1 parent 30be03c
commit 729009d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/TrafficMonitor/SkinFile.cpp b/TrafficMonitor/SkinFile.cpp
@@ -672,7 +672,7 @@ void CSkinFile::DrawItemsInfo(IDrawCommon& drawer, Layout& layout, CFont& font)
                     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.SetTextColor(cl);
                 plugin_item->DrawItem(drawer.GetDC()->GetSafeHdc(), layout_item.x, layout_item.y, layout_item.width, m_layout_info.text_height, brightness >= 128);
             }
             else

diff --git a/TrafficMonitor/TrafficMonitorDlg.cpp b/TrafficMonitor/TrafficMonitorDlg.cpp
@@ -218,15 +218,7 @@ void CTrafficMonitorDlg::SetTransparency()
 
 void CTrafficMonitorDlg::SetTransparency(int transparency)
 {
-    //清除窗口的分层样式
-    LONG style = GetWindowLong(m_hWnd, GWL_EXSTYLE);
-    style &= ~WS_EX_LAYERED;
-    SetWindowLong(m_hWnd, GWL_EXSTYLE, style);
-
-    //重新设置窗口的分层样式
-    style |= WS_EX_LAYERED;
-    SetWindowLong(m_hWnd, GWL_EXSTYLE, style);
-
+    SetWindowLong(m_hWnd, GWL_EXSTYLE, GetWindowLong(m_hWnd, GWL_EXSTYLE) | WS_EX_LAYERED);
     if (m_skin.IsPNG())
     {
         m_skin.SetAlpha(transparency * 255 / 100);
@@ -2430,7 +2422,15 @@ void CTrafficMonitorDlg::OnChangeSkin()
         }
         SetItemPosition();
         Invalidate(FALSE);      //更换皮肤后立即刷新窗口信息
-        SetTransparency();      //调用SetTransparency函数重新设置WS_EX_LAYERED样式，以解决在png皮肤和bmp皮肤之间切换时显示不正常的问题
+        //重新设置WS_EX_LAYERED样式，以解决在png皮肤和bmp皮肤之间切换时显示不正常的问题
+        //清除窗口的分层样式
+        LONG style = GetWindowLong(m_hWnd, GWL_EXSTYLE);
+        style &= ~WS_EX_LAYERED;
+        SetWindowLong(m_hWnd, GWL_EXSTYLE, style);
+        //重新设置窗口的分层样式
+        style |= WS_EX_LAYERED;
+        SetWindowLong(m_hWnd, GWL_EXSTYLE, style);
+
         theApp.SaveConfig();
     }
 }