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

improve:实时笔锋

Browse Source
This commit is contained in:
CJKmkp
2026-04-30 17:51:43 +08:00
parent f20e360c0b
commit 649a939a57
3 changed files with 135 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
+79 -13
View File
@@ -52,6 +52,7 @@ namespace Ink_Canvas
private readonly Guid RealtimeVelocityBrushTipAppliedGuid = new Guid("74E57D95-945F-4A8C-B52A-7D3EF2D4FD5B");
internal const int MouseRealtimeStrokeId = -100001;
private readonly HashSet<int> _activeRealtimeTouchStrokeIds = new HashSet<int>();
private readonly HashSet<int> _activeTouchStrokeIds = new HashSet<int>();
private sealed class OneEuroFilter
{
@@ -1202,6 +1203,28 @@ namespace Ink_Canvas
return;
}
if ((isInMultiTouchMode || Settings.Gesture.IsEnableMultiTouchMode)
&& inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint
&& inkCanvas.EditingMode != InkCanvasEditingMode.EraseByStroke
&& inkCanvas.EditingMode != InkCanvasEditingMode.Select)
{
try
{
inkCanvas.EditingMode = InkCanvasEditingMode.None;
var touchId = e.TouchDevice.Id;
var p = e.GetTouchPoint(inkCanvas).Position;
_activeTouchStrokeIds.Add(touchId);
var sv = GetStrokeVisual(touchId);
sv.Add(new StylusPoint(p.X, p.Y, 0.5f));
sv.Redraw();
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(ex);
}
return;
}
if (Settings.Canvas.EnablePalmEraser && !isPalmEraserActive && drawingShapeMode == 0)
{
var touchPoint = e.GetTouchPoint(inkCanvas);
@@ -1314,23 +1337,38 @@ namespace Ink_Canvas
EraserOverlay_PointerMove(sender, touchPoint.Position);
}
if (!ShouldUseRealtimeVelocityBrushTipForTouch())
return;
var touchId = e.TouchDevice.Id;
if (!_activeRealtimeTouchStrokeIds.Contains(touchId))
if (ShouldUseRealtimeVelocityBrushTipForTouch())
{
if (!_activeRealtimeTouchStrokeIds.Contains(touchId))
return;
try
{
var p = e.GetTouchPoint(inkCanvas).Position;
var sv = GetStrokeVisual(touchId);
if (TryAppendRealtimeVelocityBrushTipPoint(sv, touchId, p))
sv.ForceRedraw();
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(ex);
}
return;
try
{
var p = e.GetTouchPoint(inkCanvas).Position;
var sv = GetStrokeVisual(touchId);
if (TryAppendRealtimeVelocityBrushTipPoint(sv, touchId, p))
sv.ForceRedraw();
}
catch (Exception ex)
if (_activeTouchStrokeIds.Contains(touchId))
{
System.Diagnostics.Debug.WriteLine(ex);
try
{
var p = e.GetTouchPoint(inkCanvas).Position;
var sv = GetStrokeVisual(touchId);
sv.Add(new StylusPoint(p.X, p.Y, 0.5f));
sv.Redraw();
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(ex);
}
}
}
@@ -1389,6 +1427,34 @@ namespace Ink_Canvas
_activeRealtimeTouchStrokeIds.Remove(touchId);
}
}
else if (_activeTouchStrokeIds.Contains(touchId))
{
try
{
var sv = GetStrokeVisual(touchId);
sv?.Redraw();
var stroke = sv?.Stroke;
if (stroke != null)
{
inkCanvas.Strokes.Add(stroke);
inkCanvas_StrokeCollected(inkCanvas, new InkCanvasStrokeCollectedEventArgs(stroke));
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(ex);
}
finally
{
if (VisualCanvasList.TryGetValue(touchId, out var visualCanvas) && inkCanvas.Children.Contains(visualCanvas))
inkCanvas.Children.Remove(visualCanvas);
StrokeVisualList.Remove(touchId);
VisualCanvasList.Remove(touchId);
TouchDownPointsList.Remove(touchId);
CleanupRealtimeBrushTipState(touchId);
_activeTouchStrokeIds.Remove(touchId);
}
}
if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint && !isPalmEraserActive)
{