任务栏窗口水平偏移选项和垂直偏移选项仅用于Win11

zhongyang219 · Jan 22, 2025 · 31fae2c · 31fae2c
1 parent 30087f6
commit 31fae2c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/TrafficMonitor/TaskBarDlg.cpp b/TrafficMonitor/TaskBarDlg.cpp
@@ -719,12 +719,15 @@ bool CTaskBarDlg::AdjustWindowPos()
                 }
             }
             //水平偏移
-            m_rect.MoveToX(m_rect.left + DPI(theApp.m_taskbar_data.window_offset_left));
-            //确保水平方向不超出屏幕边界
-            if (m_rect.left < 0)
-                m_rect.MoveToX(0);
-            if (m_rcTaskbar.right > m_rect.Width() && m_rect.right > m_rcTaskbar.right)
-                m_rect.MoveToX(m_rcTaskbar.right - m_rect.Width());
+            if (theApp.m_is_windows11_taskbar)
+            {
+                m_rect.MoveToX(m_rect.left + DPI(theApp.m_taskbar_data.window_offset_left));
+                //确保水平方向不超出屏幕边界
+                if (m_rect.left < 0)
+                    m_rect.MoveToX(0);
+                if (m_rcTaskbar.right > m_rect.Width() && m_rect.right > m_rcTaskbar.right)
+                    m_rect.MoveToX(m_rcTaskbar.right - m_rect.Width());
+            }
 
             //设置任务栏窗口的垂直位置
             if (theApp.m_is_windows11_taskbar)
@@ -738,7 +741,7 @@ bool CTaskBarDlg::AdjustWindowPos()
             }
             else
             {
-                m_rect.MoveToY((m_rcBar.Height() - m_rect.Height()) / 2 + DPI(theApp.m_taskbar_data.window_offset_top));
+                m_rect.MoveToY((m_rcBar.Height() - m_rect.Height()) / 2);
             }
             if (theApp.m_taskbar_data.horizontal_arrange && theApp.m_win_version.IsWindows7())
                 m_rect.MoveToY(m_rect.top + DPI(1));

diff --git a/TrafficMonitor/TaskBarSettingsDlg.cpp b/TrafficMonitor/TaskBarSettingsDlg.cpp
@@ -318,12 +318,10 @@ BOOL CTaskBarSettingsDlg::OnInitDialog()
     CTaskBarDlg* taskbar_dlg{ CTrafficMonitorDlg::Instance()->GetTaskbarWindow() };
     m_window_offset_top_edit.SetRange(-5, 20);
     m_window_offset_top_edit.SetValue(m_data.window_offset_top);
-    if (taskbar_dlg != nullptr)
-        m_window_offset_top_edit.EnableWindow(taskbar_dlg->IsTasksbarOnTopOrBottom());
+    m_window_offset_top_edit.EnableWindow(theApp.m_is_windows11_taskbar);
     m_window_offset_left_edit.SetRange(-800, 800);
     m_window_offset_left_edit.SetValue(m_data.window_offset_left);
-    if (taskbar_dlg != nullptr)
-        m_window_offset_left_edit.EnableWindow(taskbar_dlg->IsTasksbarOnTopOrBottom());
+    m_window_offset_left_edit.EnableWindow(theApp.m_is_windows11_taskbar);
     m_vertical_margin_edit.SetRange(-10, 10);
     m_vertical_margin_edit.SetValue(m_data.vertical_margin);
     if (taskbar_dlg != nullptr)