diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index cb7c2a8a..aceef7c5 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -226,7 +226,7 @@ + Text="开发中...请不要点击,可能会导致ICC异常崩溃" /> diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 41c836c7..1dc5b914 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -361,15 +361,17 @@ namespace Ink_Canvas { inkCanvas.Cursor = new Cursor(sri.Stream); } - // 触摸输入,通常隐藏光标 + // 触摸输入,不隐藏光标 private void inkCanvas_TouchDown(object sender, TouchEventArgs e) { + inkCanvas.ForceCursor = false; System.Windows.Forms.Cursor.Show(); } // 触摸结束,恢复光标 private void inkCanvas_TouchUp(object sender, TouchEventArgs e) { + inkCanvas.ForceCursor = false; System.Windows.Forms.Cursor.Show(); } diff --git a/Ink_Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink_Canvas/MainWindow_cs/MW_FloatingBarIcons.cs new file mode 100644 index 00000000..a10f5629 --- /dev/null +++ b/Ink_Canvas/MainWindow_cs/MW_FloatingBarIcons.cs @@ -0,0 +1,45 @@ +#region 主要的工具按鈕事件 + +/// +/// 计算任务栏高度,桌面模式下仅计算任务栏自身高度 +/// +private double CalculateToolbarHeight(bool isDesktopMode) +{ + if (isDesktopMode) + { + // 桌面模式: 任务栏高度 = 主屏幕高度 - 全屏可用高度 + return SystemParameters.PrimaryScreenHeight - SystemParameters.FullPrimaryScreenHeight; + } + else + { + // 其他模式: 原有计算方式(包含窗口标题栏) + return SystemParameters.PrimaryScreenHeight + - SystemParameters.FullPrimaryScreenHeight + - SystemParameters.WindowCaptionHeight; + } +} + +#endregion + +public async void ViewboxFloatingBarMarginAnimation(int MarginFromEdge, + bool PosXCaculatedWithTaskbarHeight = false) +{ + + // 删除旧计算方式 + // var toolbarHeight = System.Windows.SystemParameters.PrimaryScreenHeight - System.Windows.SystemParameters.FullPrimaryScreenHeight - System.Windows.SystemParameters.WindowCaptionHeight; + + // 替换为新计算方式 + var toolbarHeight = CalculateToolbarHeight(Topmost == false); + +} + +public async void PureViewboxFloatingBarMarginAnimationInDesktopMode() +{ + // 删除旧计算方式 + // var toolbarHeight = System.Windows.SystemParameters.PrimaryScreenHeight - System.Windows.SystemParameters.FullPrimaryScreenHeight - System.Windows.SystemParameters.WindowCaptionHeight; + + // 替换为新计算方式(桌面模式专用) + var toolbarHeight = System.Windows.SystemParameters.PrimaryScreenHeight + - System.Windows.SystemParameters.FullPrimaryScreenHeight; + +}