From d713a8c5a42c989f0dc10bc884373132948f7896 Mon Sep 17 00:00:00 2001 From: CJKmkp <2564608840@qq.com> Date: Thu, 2 Oct 2025 02:30:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs index 289e9039..0ddfb577 100644 --- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs +++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs @@ -29,7 +29,6 @@ namespace Ink_Canvas { public partial class MainWindow : Window { - // 添加当前模式的缓存，避免依赖可能过时的inkCanvas.EditingMode状态 private string _currentToolMode = "cursor"; #region "手勢"按鈕 @@ -1537,7 +1536,6 @@ namespace Ink_Canvas // 仅计算Windows任务栏高度，不考虑其他程序对工作区的影响 var toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY); - // 计算浮动栏位置，考虑快捷调色盘的显示状态 // 使用更可靠的方法获取浮动栏宽度 double baseWidth = ViewboxFloatingBar.ActualWidth; @@ -1657,7 +1655,7 @@ namespace Ink_Canvas public async void PureViewboxFloatingBarMarginAnimationInDesktopMode() { - // 新增：在白板模式下不执行浮动栏动画 + // 在白板模式下不执行浮动栏动画 if (currentMode == 1) { return; @@ -1682,8 +1680,6 @@ namespace Ink_Canvas // 仅计算Windows任务栏高度，不考虑其他程序对工作区的影响 var toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY); - // 计算浮动栏位置，考虑快捷调色盘的显示状态 - // 使用更可靠的方法获取浮动栏宽度 double baseWidth = ViewboxFloatingBar.ActualWidth; // 如果ActualWidth为0，尝试使用DesiredSize @@ -1728,7 +1724,7 @@ namespace Ink_Canvas pos.X = (screenWidth - floatingBarWidth) / 2; - // 如果任务栏高度为0(隐藏状态),则使用固定边距 + // 如果任务栏高度为0,则使用固定边距 if (toolbarHeight == 0) { pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -