Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions app/lib/widgets/ink_canvas.dart
Original file line number Diff line number Diff line change
Expand Up @@ -356,13 +356,10 @@ class _InkCanvasState extends State<InkCanvas> {
widget.onStrokesChanged([]);
}

Offset _toCanvasPos(Offset globalPos) {
final box = context.findRenderObject() as RenderBox?;
if (box == null) return globalPos;
final local = box.globalToLocal(globalPos);
Offset _toCanvasPos(Offset localPos) {
return Offset(
(local.dx - _offset.dx) / _scale,
(local.dy - _offset.dy) / _scale,
(localPos.dx - _offset.dx) / _scale,
(localPos.dy - _offset.dy) / _scale,
);
}

Expand Down Expand Up @@ -393,15 +390,17 @@ class _InkCanvasState extends State<InkCanvas> {
child: Listener(
onPointerDown: (e) {
if (e.kind == PointerDeviceKind.stylus ||
e.kind == PointerDeviceKind.invertedStylus ||
e.kind == PointerDeviceKind.mouse ||
e.kind == PointerDeviceKind.touch) {
final pressure = e.pressure > 0 ? e.pressure : 0.5;
_startStroke(_toCanvasPos(e.position), pressure);
_startStroke(_toCanvasPos(e.localPosition), pressure);
}
},
onPointerMove: (e) {
if (_currentStroke == null) return;
final pressure = e.pressure > 0 ? e.pressure : 0.5;
_addPoint(_toCanvasPos(e.position), pressure);
_addPoint(_toCanvasPos(e.localPosition), pressure);
},
onPointerUp: (_) => _endStroke(),
onPointerCancel: (_) => _endStroke(),
Expand Down
Loading