diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 16f1d181..0cb84fb8 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -150,7 +150,9 @@ namespace Ink_Canvas { // 修复“显示画笔光标”选项不可用的问题 if (Settings.Canvas.IsShowCursor) { inkCanvas1.UseCustomCursor = true; - if (inkCanvas1.EditingMode == InkCanvasEditingMode.Ink || drawingShapeMode != 0) + // 修复触屏时光标不显示:只要有输入设备悬停就显示 + if ((inkCanvas1.EditingMode == InkCanvasEditingMode.Ink || drawingShapeMode != 0) + && (inkCanvas1.IsStylusDirectlyOver || inkCanvas1.IsMouseDirectlyOver)) inkCanvas1.ForceCursor = true; else inkCanvas1.ForceCursor = false; diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache index 932a1313..0b5fd924 100644 Binary files a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache and b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache differ diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache index fea282ed..c6334c11 100644 --- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache +++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache @@ -16,5 +16,5 @@ E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\App.xaml 46-47806484 MainWindow.xaml;Resources\DrawShapeImageDictionary.xaml;Resources\IconImageDictionary.xaml;Resources\SeewoImageDictionary.xaml;Resources\Styles\Dark.xaml;Resources\Styles\Light.xaml;Windows\CountdownTimerWindow.xaml;Windows\CycleProcessBar.xaml;Windows\HasNewUpdateWindow.xaml;Windows\NamesInputWindow.xaml;Windows\OperatingGuideWindow.xaml;Windows\RandWindow.xaml;Windows\YesOrNoNotificationWindow.xaml; -True +False