All checks were successful
CI / Windows build (push) Successful in 14m2s
Eraser preview (user request, "加一个淡一点的描边"): new EraserPreviewPainter shows the eraser circle and a faint red outline over the committed strokes the eraser currently overlaps, so you can see what is about to be deleted. Mounted only in eraser mode (tool or barrel/inverted signal) with a live cursor that follows the hovering/erasing pen; shares _eraserRadius/_pageAspect with the live erase so preview and action always agree. Kept in its own RepaintBoundary. Pen-feel fix (the "写字识别成单击" pan-steal): panEnabled now also requires the last pointer to not be a stylus. Windows fires stylus HOVER before contact, so _lastStylus is already true when the pen touches down -> the InteractiveViewer's pan is disabled BEFORE the stroke's first move, instead of one frame late. A 2+ pointer pinch still always pans (focal translation); a finger/mouse down flips _lastStylus back so finger-pan keeps working. Grounded in Rnote + Saber research: Saber uses the same button detection we have (buttons==kSecondaryButton || invertedStylus); the deeper zoom-flash / draw-vs- pan robustness wants a Saber-style forked InteractiveViewer (single recognizer, decide-at-start) -- scoped as the next step, not done here. 66/66 tests, linux build green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
226 lines
7.0 KiB
Dart
226 lines
7.0 KiB
Dart
// lib/editor/canvas/ink_painters.dart
|
|
//
|
|
// CustomPainters for the ink layers. Strokes are stored in normalized page
|
|
// coordinates; both painters receive the on-screen page [Size] and scale
|
|
// points into pixels at paint time. perfect_freehand produces the outline.
|
|
|
|
import 'package:flutter/material.dart';
|
|
import 'package:perfect_freehand/perfect_freehand.dart' as pf;
|
|
|
|
import '../engine/stroke_eraser.dart' show strokeHit;
|
|
import '../engine/stroke_geometry.dart' show kDefaultPenThinning;
|
|
import 'pen_stroke.dart';
|
|
|
|
/// Builds a filled outline [Path] for one stroke (already scaled to pixels).
|
|
///
|
|
/// [pageSize] maps normalized coords to pixels. [isComplete] should be false
|
|
/// for the in-progress live stroke so freehand tapers correctly. [thinning] is
|
|
/// the pressure→width response (shared default [kDefaultPenThinning]); the
|
|
/// SAME value drives the export path so screen and PDF never diverge.
|
|
Path buildStrokePath(
|
|
PenStroke stroke,
|
|
Size pageSize, {
|
|
required bool isComplete,
|
|
double thinning = kDefaultPenThinning,
|
|
}) {
|
|
final pixelWidth = stroke.width * pageSize.width;
|
|
|
|
final hasRealPressure = stroke.points.any((p) => p.pressure != null);
|
|
final isHighlighter = stroke.kind == PenStrokeKind.highlighter;
|
|
|
|
final pfPoints = stroke.points
|
|
.map(
|
|
(p) => pf.PointVector(
|
|
p.x * pageSize.width,
|
|
p.y * pageSize.height,
|
|
p.pressure ?? 0.5,
|
|
),
|
|
)
|
|
.toList();
|
|
|
|
final outline = pf.getStroke(
|
|
pfPoints,
|
|
options: pf.StrokeOptions(
|
|
size: pixelWidth,
|
|
// Highlighter keeps a constant width (no thinning); pen uses the
|
|
// configurable [thinning] so real Surface-Pen pressure changes width.
|
|
thinning: isHighlighter ? 0.0 : thinning,
|
|
smoothing: 0.5,
|
|
streamline: 0.5,
|
|
// Real stylus pressure → don't simulate; no pressure → let freehand fake
|
|
// it based on velocity. (perfect_freehand 2.x honors REAL pressure when
|
|
// simulatePressure is false — 1.0.4 ignored it, which made width
|
|
// unresponsive to pen force.)
|
|
simulatePressure: !hasRealPressure && !isHighlighter,
|
|
isComplete: isComplete,
|
|
),
|
|
);
|
|
|
|
final path = Path();
|
|
if (outline.isEmpty) return path;
|
|
path.moveTo(outline.first.dx, outline.first.dy);
|
|
for (var i = 1; i < outline.length; i++) {
|
|
path.lineTo(outline[i].dx, outline[i].dy);
|
|
}
|
|
path.close();
|
|
return path;
|
|
}
|
|
|
|
/// Paints all committed strokes for the page. Repaints only when the stroke
|
|
/// list identity or page size changes (kept behind a RepaintBoundary).
|
|
class StaticInkPainter extends CustomPainter {
|
|
StaticInkPainter({
|
|
required this.strokes,
|
|
required this.pageSize,
|
|
this.thinning = kDefaultPenThinning,
|
|
});
|
|
|
|
final List<PenStroke> strokes;
|
|
final Size pageSize;
|
|
|
|
/// Pressure→width response shared with the live/export paths.
|
|
final double thinning;
|
|
|
|
@override
|
|
void paint(Canvas canvas, Size size) {
|
|
for (final stroke in strokes) {
|
|
final path =
|
|
buildStrokePath(stroke, pageSize, isComplete: true, thinning: thinning);
|
|
if (path.getBounds().isEmpty) continue;
|
|
canvas.drawPath(
|
|
path,
|
|
Paint()
|
|
..color = Color(stroke.color)
|
|
..style = PaintingStyle.fill
|
|
..isAntiAlias = true,
|
|
);
|
|
}
|
|
}
|
|
|
|
@override
|
|
bool shouldRepaint(StaticInkPainter old) =>
|
|
!identical(old.strokes, strokes) ||
|
|
old.strokes.length != strokes.length ||
|
|
old.pageSize != pageSize ||
|
|
old.thinning != thinning;
|
|
}
|
|
|
|
/// Eraser preview: shows the eraser circle and faintly highlights the committed
|
|
/// strokes the eraser would delete, so the user can see what is about to go.
|
|
/// Mounted only while the eraser is the active mode and the pen is near the
|
|
/// page; kept behind its own RepaintBoundary so it never dirties the ink layers.
|
|
class EraserPreviewPainter extends CustomPainter {
|
|
EraserPreviewPainter({
|
|
required this.strokes,
|
|
required this.cursor,
|
|
required this.radius,
|
|
required this.aspect,
|
|
required this.pageSize,
|
|
this.thinning = kDefaultPenThinning,
|
|
});
|
|
|
|
final List<PenStroke> strokes;
|
|
|
|
/// Eraser center in normalized page coords, or null when no preview.
|
|
final PenPoint? cursor;
|
|
|
|
/// Eraser radius as a fraction of page width (matches the live erase test).
|
|
final double radius;
|
|
|
|
/// Page aspect (height / width) so the on-screen circle stays round.
|
|
final double aspect;
|
|
|
|
final Size pageSize;
|
|
final double thinning;
|
|
|
|
@override
|
|
void paint(Canvas canvas, Size size) {
|
|
final c = cursor;
|
|
if (c == null) return;
|
|
|
|
// Faint outline on each stroke the eraser currently overlaps.
|
|
final highlight = Paint()
|
|
..color = const Color(0xFFFF5252).withValues(alpha: 0.55)
|
|
..style = PaintingStyle.stroke
|
|
..strokeWidth = 1.5
|
|
..isAntiAlias = true;
|
|
for (final stroke in strokes) {
|
|
if (!strokeHit(stroke, c.x, c.y, radius, aspect: aspect)) continue;
|
|
final path =
|
|
buildStrokePath(stroke, pageSize, isComplete: true, thinning: thinning);
|
|
if (path.getBounds().isEmpty) continue;
|
|
canvas.drawPath(path, highlight);
|
|
}
|
|
|
|
// The eraser circle itself (radius is a page-width fraction → px = r * w).
|
|
final center = Offset(c.x * pageSize.width, c.y * pageSize.height);
|
|
final rPx = radius * pageSize.width;
|
|
canvas.drawCircle(
|
|
center,
|
|
rPx,
|
|
Paint()
|
|
..color = const Color(0xFF9E9E9E).withValues(alpha: 0.5)
|
|
..style = PaintingStyle.stroke
|
|
..strokeWidth = 1.0
|
|
..isAntiAlias = true,
|
|
);
|
|
canvas.drawCircle(
|
|
center,
|
|
rPx,
|
|
Paint()
|
|
..color = const Color(0x14000000)
|
|
..style = PaintingStyle.fill,
|
|
);
|
|
}
|
|
|
|
@override
|
|
bool shouldRepaint(EraserPreviewPainter old) =>
|
|
old.cursor?.x != cursor?.x ||
|
|
old.cursor?.y != cursor?.y ||
|
|
old.radius != radius ||
|
|
old.aspect != aspect ||
|
|
!identical(old.strokes, strokes) ||
|
|
old.strokes.length != strokes.length ||
|
|
old.pageSize != pageSize ||
|
|
old.thinning != thinning;
|
|
}
|
|
|
|
/// Paints just the in-progress stroke (the live layer), kept behind its own
|
|
/// RepaintBoundary so committed strokes don't repaint on every move.
|
|
class LiveInkPainter extends CustomPainter {
|
|
LiveInkPainter({
|
|
required this.stroke,
|
|
required this.pageSize,
|
|
this.thinning = kDefaultPenThinning,
|
|
});
|
|
|
|
/// Current in-progress stroke, or null when nothing is being drawn.
|
|
final PenStroke? stroke;
|
|
final Size pageSize;
|
|
|
|
/// Pressure→width response shared with the static/export paths.
|
|
final double thinning;
|
|
|
|
@override
|
|
void paint(Canvas canvas, Size size) {
|
|
final s = stroke;
|
|
if (s == null || s.points.isEmpty) return;
|
|
final path =
|
|
buildStrokePath(s, pageSize, isComplete: false, thinning: thinning);
|
|
if (path.getBounds().isEmpty) return;
|
|
canvas.drawPath(
|
|
path,
|
|
Paint()
|
|
..color = Color(s.color)
|
|
..style = PaintingStyle.fill
|
|
..isAntiAlias = true,
|
|
);
|
|
}
|
|
|
|
@override
|
|
bool shouldRepaint(LiveInkPainter old) =>
|
|
!identical(old.stroke, stroke) ||
|
|
old.pageSize != pageSize ||
|
|
old.thinning != thinning;
|
|
}
|