在Wine环境下时任务栏窗口显示在桌面的右下角

Author: zhongyang219

TrafficMonitor/TrafficMonitor.cpp

@@ -1302,10 +1302,10 @@ void CTrafficMonitorApp::UpdatePluginMenu(CMenu* pMenu, ITMPlugin* plugin, int p
 
 void CTrafficMonitorApp::CheckWindows11Taskbar()
 {
-    HWND hTaskbar = ::FindWindow(L"Shell_TrayWnd", NULL);
     // 在“Shell_TrayWnd”的子窗口找到类名为“Windows.UI.Composition.DesktopWindowContentBridge”的窗口则认为是Windows11的任务栏
     if (m_win_version.IsWindows11OrLater())
     {
+        HWND hTaskbar = ::FindWindow(L"Shell_TrayWnd", NULL);
         m_is_windows11_taskbar = (::FindWindowExW(hTaskbar, 0, L"Windows.UI.Composition.DesktopWindowContentBridge", NULL) != NULL);
     }
     else

TrafficMonitor/TrafficMonitor.vcxproj

@@ -865,6 +865,7 @@
     <ClInclude Include="Win11TaskbarSettingDlg.h" />
     <ClInclude Include="WindowsSettingHelper.h" />
     <ClInclude Include="WindowsWebExperienceDetector.h" />
+    <ClInclude Include="WineTaskbarDlg.h" />
     <ClInclude Include="WinVersionHelper.h" />
   </ItemGroup>
   <ItemGroup>
@@ -981,6 +982,7 @@
     <ClCompile Include="Win11TaskbarSettingDlg.cpp" />
     <ClCompile Include="WindowsSettingHelper.cpp" />
     <ClCompile Include="WindowsWebExperienceDetector.cpp" />
+    <ClCompile Include="WineTaskbarDlg.cpp" />
     <ClCompile Include="WinVersionHelper.cpp" />
   </ItemGroup>
   <ItemGroup>

TrafficMonitor/TrafficMonitor.vcxproj.filters

@@ -553,6 +553,9 @@
     <ClInclude Include="DisplayItem.h">
       <Filter>源文件和头文件\公共的类\DisplayItem</Filter>
     </ClInclude>
+    <ClInclude Include="WineTaskbarDlg.h">
+      <Filter>源文件和头文件\TaskBarDlg</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="StaticEx.cpp">
@@ -819,6 +822,9 @@
     <ClCompile Include="DisplayItem.cpp">
       <Filter>源文件和头文件\公共的类\DisplayItem</Filter>
     </ClCompile>
+    <ClCompile Include="WineTaskbarDlg.cpp">
+      <Filter>源文件和头文件\TaskBarDlg</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="TrafficMonitor.rc">

TrafficMonitor/TrafficMonitorDlg.cpp

@@ -15,6 +15,7 @@
 #include "SupportedRenderEnums.h"
 #include "ClassicalTaskbarDlg.h"
 #include "Win11TaskbarDlg.h"
+#include "WineTaskbarDlg.h"
 #include "TaskbarHelper.h"
 #include "SkinManager.h"
 
@@ -565,7 +566,9 @@ void CTrafficMonitorDlg::OpenTaskBarWnd()
 {
     // 强制初始化theApp.m_is_windows11_taskbar的值
     theApp.CheckWindows11Taskbar();
-    if (theApp.IsWindows11Taskbar())
+    if (theApp.m_win_version.IsWine())
+        m_tBarDlg = new CWineTaskbarDlg();
+    else if (theApp.IsWindows11Taskbar())
         m_tBarDlg = new CWin11TaskbarDlg();
     else
         m_tBarDlg = new CClassicalTaskbarDlg();

TrafficMonitor/WinVersionHelper.h

@@ -12,7 +12,7 @@ class CWinVersionHelper
     bool IsWindows8Point1OrLater() const;       //判断Windows版本是否大于等于Windows8.1
     bool IsWindows8OrLater() const;
     bool IsWindows10OrLater() const;
-	bool IsWine() const;
+	bool IsWine() const;						//判断是否在Wine环境下
 
 	int GetMajorVersion() const { return m_major_version; }
 	int GetMinorVersion() const { return m_minor_version; }

TrafficMonitor/WineTaskbarDlg.cpp

@@ -0,0 +1,30 @@
+#include "stdafx.h"
+#include "WineTaskbarDlg.h"
+
+void CWineTaskbarDlg::InitTaskbarWnd()
+{
+}
+
+void CWineTaskbarDlg::AdjustTaskbarWndPos(bool force_adjust)
+{
+    //Òƶ¯µ½×ÀÃæÓÒϽÇ
+    int screen_width = GetSystemMetrics(SM_CXSCREEN);
+    int screen_height = GetSystemMetrics(SM_CYSCREEN);
+    CRect rect{ m_rect };
+    rect.MoveToXY(screen_width - m_rect.Width(), screen_height - m_rect.Height());
+    this->MoveWindow(rect);
+}
+
+void CWineTaskbarDlg::ResetTaskbarPos()
+{
+}
+
+void CWineTaskbarDlg::CheckTaskbarOnTopOrBottom()
+{
+    m_taskbar_on_top_or_bottom = true;
+}
+
+HWND CWineTaskbarDlg::GetParentHwnd()
+{
+    return GetDesktopWindow()->GetSafeHwnd();
+}

TrafficMonitor/WineTaskbarDlg.h

@@ -0,0 +1,14 @@
+#pragma once
+#include "TaskBarDlg.h"
+class CWineTaskbarDlg :
+    public CTaskBarDlg
+{
+private:
+    // ͨ¹ý CTaskBarDlg ¼Ì³Ð
+    void InitTaskbarWnd() override;
+    void AdjustTaskbarWndPos(bool force_adjust) override;
+    void ResetTaskbarPos() override;
+    void CheckTaskbarOnTopOrBottom() override;
+    HWND GetParentHwnd() override;
+};
+