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

fix:触摸线擦

Browse Source
This commit is contained in:
CJKmkp
2025-08-11 09:13:12 +08:00
parent 8b327fd715
commit 2245a018e6
1 changed files with 56 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
+56 -35
View File
@@ -71,7 +71,8 @@ namespace Ink_Canvas
inkCanvas.StylusUp -= MainWindow_StylusUp; inkCanvas.StylusUp -= MainWindow_StylusUp;
inkCanvas.TouchDown -= MainWindow_TouchDown; inkCanvas.TouchDown -= MainWindow_TouchDown;
inkCanvas.TouchDown += Main_Grid_TouchDown; inkCanvas.TouchDown += Main_Grid_TouchDown;
if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint
&& inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke)
{ {
inkCanvas.EditingMode = InkCanvasEditingMode.Ink; inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
} }
@@ -91,7 +92,8 @@ namespace Ink_Canvas
inkCanvas.StylusUp += MainWindow_StylusUp; inkCanvas.StylusUp += MainWindow_StylusUp;
inkCanvas.TouchDown += MainWindow_TouchDown; inkCanvas.TouchDown += MainWindow_TouchDown;
inkCanvas.TouchDown -= Main_Grid_TouchDown; inkCanvas.TouchDown -= Main_Grid_TouchDown;
if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint
&& inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke)
{ {
inkCanvas.EditingMode = InkCanvasEditingMode.None; inkCanvas.EditingMode = InkCanvasEditingMode.None;
} }
@@ -127,7 +129,8 @@ namespace Ink_Canvas
// 只保留普通橡皮逻辑 // 只保留普通橡皮逻辑
TouchDownPointsList[e.TouchDevice.Id] = InkCanvasEditingMode.None; TouchDownPointsList[e.TouchDevice.Id] = InkCanvasEditingMode.None;
inkCanvas.EraserShape = new EllipseStylusShape(50, 50); inkCanvas.EraserShape = new EllipseStylusShape(50, 50);
if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint
&& inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke)
{ {
inkCanvas.EditingMode = InkCanvasEditingMode.None; inkCanvas.EditingMode = InkCanvasEditingMode.None;
} }
@@ -149,7 +152,11 @@ namespace Ink_Canvas
inkCanvas.EditingMode = InkCanvasEditingMode.None; inkCanvas.EditingMode = InkCanvasEditingMode.None;
return; return;
} }
inkCanvas.EditingMode = InkCanvasEditingMode.Ink; // 修复：保持当前的线擦模式，不要强制切换到Ink模式
if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke)
{
inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
}
} }
SetCursorBasedOnEditingMode(inkCanvas); SetCursorBasedOnEditingMode(inkCanvas);
@@ -320,7 +327,12 @@ namespace Ink_Canvas
{ {
return; return;
} }
if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByStroke)
{
return;
}
if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint
&& inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke)
{ {
inkCanvas.EditingMode = InkCanvasEditingMode.Ink; inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
} }
@@ -335,14 +347,15 @@ namespace Ink_Canvas
private void inkCanvas_PreviewTouchDown(object sender, TouchEventArgs e) private void inkCanvas_PreviewTouchDown(object sender, TouchEventArgs e)
{ {
// 橡皮状态下不做任何切换，直接return，保证橡皮可持续 // 橡皮状态下不做任何切换，直接return，保证橡皮可持续
if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint
|| inkCanvas.EditingMode == InkCanvasEditingMode.EraseByStroke)
{ {
return; return;
} }
// 修复：几何绘制模式下完全禁止触摸轨迹收集 // 修复：几何绘制模式下完全禁止触摸轨迹收集
if (drawingShapeMode != 0) if (drawingShapeMode != 0)
{ {
// 确保几何绘制模式下不切换到Ink模式，避免触摸轨迹被收集 // 确保几何绘制模式下不切换到Ink模式，避免触摸轨迹收集
inkCanvas.EditingMode = InkCanvasEditingMode.None; inkCanvas.EditingMode = InkCanvasEditingMode.None;
// 几何绘制模式下不记录触摸点，避免触摸轨迹被收集 // 几何绘制模式下不记录触摸点，避免触摸轨迹被收集
SetCursorBasedOnEditingMode(inkCanvas); SetCursorBasedOnEditingMode(inkCanvas);
@@ -350,37 +363,37 @@ namespace Ink_Canvas
ViewboxFloatingBar.IsHitTestVisible = false; ViewboxFloatingBar.IsHitTestVisible = false;
BlackboardUIGridForInkReplay.IsHitTestVisible = false; BlackboardUIGridForInkReplay.IsHitTestVisible = false;
// 修复：几何绘制模式下，只记录几何绘制的起点，不记录触摸轨迹 // 修复：几何绘制模式下，只记录几何绘制的起点，不记录触摸轨迹
if (dec.Count == 0) if (dec.Count == 0)
{
var touchPoint = e.GetTouchPoint(inkCanvas);
// 对于双曲线绘制，第一笔时记录起点，第二笔时不更新起点
if (drawingShapeMode == 24 || drawingShapeMode == 25)
{ {
// 双曲线绘制：第一笔记录起点，第二笔保持第一笔的起点 var touchPoint = e.GetTouchPoint(inkCanvas);
if (drawMultiStepShapeCurrentStep == 0) // 对于双曲线绘制，第一笔时记录起点，第二笔时不更新起点
if (drawingShapeMode == 24 || drawingShapeMode == 25)
{ {
// 双曲线绘制：第一笔记录起点，第二笔保持第一笔的起点
if (drawMultiStepShapeCurrentStep == 0)
{
iniP = touchPoint.Position;
}
// 第二笔时不更新iniP，保持第一笔的起点
}
else
{
// 其他图形正常记录起点
iniP = touchPoint.Position; iniP = touchPoint.Position;
} }
// 第二笔时不更新iniP，保持第一笔的起点 lastTouchDownStrokeCollection = inkCanvas.Strokes.Clone();
} }
else dec.Add(e.TouchDevice.Id);
{ return;
// 其他图形正常记录起点
iniP = touchPoint.Position;
}
lastTouchDownStrokeCollection = inkCanvas.Strokes.Clone();
} }
dec.Add(e.TouchDevice.Id);
return;
}
// 非几何绘制模式下的正常触摸处理 // 非几何绘制模式下的正常触摸处理
SetCursorBasedOnEditingMode(inkCanvas); SetCursorBasedOnEditingMode(inkCanvas);
inkCanvas.CaptureTouch(e.TouchDevice); inkCanvas.CaptureTouch(e.TouchDevice);
ViewboxFloatingBar.IsHitTestVisible = false; ViewboxFloatingBar.IsHitTestVisible = false;
BlackboardUIGridForInkReplay.IsHitTestVisible = false; BlackboardUIGridForInkReplay.IsHitTestVisible = false;
dec.Add(e.TouchDevice.Id); dec.Add(e.TouchDevice.Id);
// Palm Eraser 逻辑 // Palm Eraser 逻辑
if (Settings.Canvas.EnablePalmEraser && dec.Count >= 2 && !isPalmEraserActive) if (Settings.Canvas.EnablePalmEraser && dec.Count >= 2 && !isPalmEraserActive)
@@ -435,7 +448,9 @@ namespace Ink_Canvas
inkCanvas.EditingMode == InkCanvasEditingMode.Select) return; inkCanvas.EditingMode == InkCanvasEditingMode.Select) return;
lastInkCanvasEditingMode = inkCanvas.EditingMode; lastInkCanvasEditingMode = inkCanvas.EditingMode;
// 修复：几何绘制模式下禁止切回Ink // 修复：几何绘制模式下禁止切回Ink
if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint && drawingShapeMode == 0) if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint
&& inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke
&& drawingShapeMode == 0)
{ {
inkCanvas.EditingMode = InkCanvasEditingMode.None; inkCanvas.EditingMode = InkCanvasEditingMode.None;
} }
@@ -561,7 +576,9 @@ namespace Ink_Canvas
{ {
if (e.Manipulators.Count() != 0) return; if (e.Manipulators.Count() != 0) return;
// 修复：几何绘制模式下不自动切换到Ink模式，避免触摸轨迹被收集 // 修复：几何绘制模式下不自动切换到Ink模式，避免触摸轨迹被收集
if (drawingShapeMode == 0 && inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) if (drawingShapeMode == 0
&& inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint
&& inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke)
{ {
inkCanvas.EditingMode = InkCanvasEditingMode.Ink; inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
// 修复：确保多指手势完成后正确更新lastInkCanvasEditingMode // 修复：确保多指手势完成后正确更新lastInkCanvasEditingMode
@@ -684,7 +701,9 @@ namespace Ink_Canvas
inkCanvas.TouchDown -= MainWindow_TouchDown; inkCanvas.TouchDown -= MainWindow_TouchDown;
inkCanvas.TouchDown += Main_Grid_TouchDown; inkCanvas.TouchDown += Main_Grid_TouchDown;
// 修复：几何绘制模式下不自动切换到Ink模式，避免触摸轨迹被收集 // 修复：几何绘制模式下不自动切换到Ink模式，避免触摸轨迹被收集
if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint && drawingShapeMode == 0) if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint
&& inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke
&& drawingShapeMode == 0)
{ {
inkCanvas.EditingMode = InkCanvasEditingMode.Ink; inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
} }
@@ -715,7 +734,9 @@ namespace Ink_Canvas
inkCanvas.TouchDown += MainWindow_TouchDown; inkCanvas.TouchDown += MainWindow_TouchDown;
inkCanvas.TouchDown -= Main_Grid_TouchDown; inkCanvas.TouchDown -= Main_Grid_TouchDown;
// 修复：几何绘制模式下不自动切换到Ink模式，避免触摸轨迹被收集 // 修复：几何绘制模式下不自动切换到Ink模式，避免触摸轨迹被收集
if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint && drawingShapeMode == 0) if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint
&& inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke
&& drawingShapeMode == 0)
{ {
inkCanvas.EditingMode = InkCanvasEditingMode.None; inkCanvas.EditingMode = InkCanvasEditingMode.None;
} }