CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

撤销 Commit ab88c34

Browse Source
This commit is contained in:
unknown
2025-07-18 11:50:44 +08:00
parent 8ab60ad000
commit ee018ea287
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow.xaml.cs
-3
View File
@@ -160,11 +160,9 @@ namespace Ink_Canvas {
private void inkCanvas_EditingModeChanged(object sender, RoutedEventArgs e) {
var inkCanvas1 = sender as InkCanvas;
if (inkCanvas1 == null) return;
<<<<<<< HEAD
// 使用辅助方法设置光标
SetCursorBasedOnEditingMode(inkCanvas1);
=======
if (Settings.Canvas.IsShowCursor) {
if (inkCanvas1.EditingMode == InkCanvasEditingMode.Ink || drawingShapeMode != 0)
inkCanvas1.ForceCursor = true;
@@ -173,7 +171,6 @@ namespace Ink_Canvas {
} else {
inkCanvas1.ForceCursor = false;
}
>>>>>>> parent of ab88c34 (fix:issue #23)
if (inkCanvas1.EditingMode == InkCanvasEditingMode.Ink) forcePointEraser = !forcePointEraser;
}
Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
-3
View File
@@ -303,17 +303,14 @@ namespace Ink_Canvas {
}
else {
isLastTouchEraser = false;
<<<<<<< HEAD
currentPalmEraserShape = null;
// 修复面积擦时不显示橡皮形状：无论 forcePointEraser 状态，均显示 50x50 橡皮
inkCanvas.EraserShape = new EllipseStylusShape(50, 50);
// 修复触屏状态下几何绘制功能不可用的问题：在几何绘制模式下不应该因为forceEraser而直接返回
if (forceEraser && drawingShapeMode == 0) return;
=======
inkCanvas.EraserShape =
forcePointEraser ? new EllipseStylusShape(50, 50) : new EllipseStylusShape(5, 5);
if (forceEraser) return;
>>>>>>> parent of b46cbcc (fix:issue #23)
inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
}
}
Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
BIN
View File
Binary file not shown.
Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache
+6 -6
View File
@@ -4,17 +4,17 @@
winexe
C#
.cs
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\
E:\ICC CE\ICC CE main\community\Ink Canvas\obj\Debug\net472\
Ink_Canvas
none
false
TRACE;DEBUG;NETFRAMEWORK;NET472;;NET30_OR_GREATER;NET35_OR_GREATER;NET40_OR_GREATER;NET45_OR_GREATER;NET451_OR_GREATER;NET452_OR_GREATER;NET46_OR_GREATER;NET461_OR_GREATER;NET462_OR_GREATER;NET47_OR_GREATER;NET471_OR_GREATER;NET472_OR_GREATER
E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\App.xaml
13173459795
E:\ICC CE\ICC CE main\community\Ink Canvas\App.xaml
201780504554
56-1167124909
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;
72875899768
46-932173576
Helpers\Plugins\BuiltIn\SuperLauncher\LauncherSettingsControl.xaml;Helpers\Plugins\BuiltIn\SuperLauncher\LauncherWindow.xaml;MainWindow.xaml;Resources\DrawShapeImageDictionary.xaml;Resources\IconImageDictionary.xaml;Resources\SeewoImageDictionary.xaml;Resources\Styles\Dark.xaml;Resources\Styles\Light.xaml;Windows\AddCustomIconWindow.xaml;Windows\AddPickNameBackgroundWindow.xaml;Windows\CountdownTimerWindow.xaml;Windows\CustomIconWindow.xaml;Windows\CycleProcessBar.xaml;Windows\HasNewUpdateWindow.xaml;Windows\ManagePickNameBackgroundsWindow.xaml;Windows\NamesInputWindow.xaml;Windows\OperatingGuideWindow.xaml;Windows\PluginSettingsWindow.xaml;Windows\RandWindow.xaml;Windows\YesOrNoNotificationWindow.xaml;
False