Files
BadNote/lib/editor/input/pen_config.dart
Akiba So 4fb431727e
Some checks failed
CI / Windows build (push) Has been cancelled
feat(eraser): configurable size + stroke-eraser mode
"优化橡皮擦工具,你优化在哪" — the eraser already did segment erase, but
the radius was a hardcoded const with no size control and no whole-stroke
mode. Add both, OneNote/Notability-style:

- PenConfig: eraserRadius (0.005-0.1, default 0.02) + eraserWholeStroke
  bool, with copyWith / JSON / setters.
- PenCanvas: uses widget.eraserRadius for the live hit area AND the cursor
  preview (they stay in sync); eraserWholeStroke=true removes the whole
  stroke on contact, false keeps the segment-split behavior.
- pen_editor threads both from PenConfig.
- pen-settings: new Eraser section — size slider + "Stroke Eraser" switch.

Tests: pen_eraser_mode_widget proves point-eraser keeps the untouched ends
while stroke-eraser deletes the whole stroke from the same pass.

flutter analyze: 0 issues.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-23 09:47:58 +08:00

305 lines
11 KiB
Dart

import 'dart:convert';
import 'dart:math';
import 'package:flutter/foundation.dart';
import 'package:shared_preferences/shared_preferences.dart';
import '../engine/stroke_geometry.dart' show kDefaultPenThinning;
import 'pressure_curve.dart' show kNaturalPressureGamma;
/// Default eraser radius as a fraction of page width (the legacy fixed value,
/// now the default of the configurable [PenConfig.eraserRadius]).
const double kDefaultEraserRadius = 0.02;
/// Action that can be triggered by a hardware pen button or the eraser end.
enum PenButtonAction {
none,
eraser,
undo,
toggleTool,
pan,
}
/// Immutable configuration for pen input behaviour.
///
/// Persisted under SharedPreferences key [PenConfigController.prefsKey].
class PenConfig {
const PenConfig({
this.sideButton = PenButtonAction.eraser,
this.eraserEnd = PenButtonAction.eraser,
this.pressureGamma = kNaturalPressureGamma,
this.palmRejectionMs = 150.0,
this.fingerDrawing = false,
this.penWidth = 0.004,
this.highlighterWidth = 0.02,
this.pressureSensitivity = kDefaultPenThinning,
this.eraserRadius = kDefaultEraserRadius,
this.eraserWholeStroke = false,
}) : assert(pressureGamma >= 0.3 && pressureGamma <= 3.0,
'pressureGamma must be in [0.3, 3.0]'),
assert(palmRejectionMs >= 0.0 && palmRejectionMs <= 500.0,
'palmRejectionMs must be in [0, 500]'),
assert(pressureSensitivity >= 0.0 && pressureSensitivity <= 1.0,
'pressureSensitivity must be in [0, 1]'),
assert(eraserRadius >= 0.005 && eraserRadius <= 0.1,
'eraserRadius must be in [0.005, 0.1]');
/// Which action fires when the side barrel button is held.
final PenButtonAction sideButton;
/// Which action fires when the eraser end of the pen is used.
final PenButtonAction eraserEnd;
/// Gamma exponent for the pressure curve: effective = pressure ^ gamma.
/// Range: [0.3, 3.0], default 1.0 (linear).
final double pressureGamma;
/// Duration in milliseconds after a pen-down event during which touch
/// contact is treated as palm and rejected.
/// Range: [0, 500], default 150.
final double palmRejectionMs;
/// Whether finger touch strokes are drawn when no pen is present.
final bool fingerDrawing;
/// Pen stroke width as a fraction of the canvas width.
final double penWidth;
/// Highlighter stroke width as a fraction of the canvas width.
final double highlighterWidth;
/// How strongly stylus pressure modulates stroke width — maps directly to
/// perfect_freehand's `thinning`. Range [0,1]; `0` = constant width,
/// higher = pressure sweeps width more (Saber's `StrokeOptions.thinning`
/// model). Default [kDefaultPenThinning] so the out-of-box feel and the
/// export golden are unchanged.
final double pressureSensitivity;
/// Eraser radius as a fraction of page width. Range [0.005, 0.1], default
/// [kDefaultEraserRadius]. Controls both the live erase hit area and the
/// on-screen eraser cursor.
final double eraserRadius;
/// When true the eraser removes a WHOLE stroke on contact (OneNote-style
/// stroke eraser); when false it does a partial / segment erase (the default,
/// rnote-style point eraser).
final bool eraserWholeStroke;
PenConfig copyWith({
PenButtonAction? sideButton,
PenButtonAction? eraserEnd,
double? pressureGamma,
double? palmRejectionMs,
bool? fingerDrawing,
double? penWidth,
double? highlighterWidth,
double? pressureSensitivity,
double? eraserRadius,
bool? eraserWholeStroke,
}) {
return PenConfig(
sideButton: sideButton ?? this.sideButton,
eraserEnd: eraserEnd ?? this.eraserEnd,
pressureGamma: pressureGamma ?? this.pressureGamma,
palmRejectionMs: palmRejectionMs ?? this.palmRejectionMs,
fingerDrawing: fingerDrawing ?? this.fingerDrawing,
penWidth: penWidth ?? this.penWidth,
highlighterWidth: highlighterWidth ?? this.highlighterWidth,
pressureSensitivity: pressureSensitivity ?? this.pressureSensitivity,
eraserRadius: eraserRadius ?? this.eraserRadius,
eraserWholeStroke: eraserWholeStroke ?? this.eraserWholeStroke,
);
}
Map<String, dynamic> toJson() => {
'sideButton': sideButton.name,
'eraserEnd': eraserEnd.name,
'pressureGamma': pressureGamma,
'palmRejectionMs': palmRejectionMs,
'fingerDrawing': fingerDrawing,
'penWidth': penWidth,
'highlighterWidth': highlighterWidth,
'pressureSensitivity': pressureSensitivity,
'eraserRadius': eraserRadius,
'eraserWholeStroke': eraserWholeStroke,
};
factory PenConfig.fromJson(Map<String, dynamic> json) {
return PenConfig(
sideButton:
PenButtonAction.values.asNameMap()[json['sideButton'] as String? ?? ''] ??
PenButtonAction.eraser,
eraserEnd:
PenButtonAction.values.asNameMap()[json['eraserEnd'] as String? ?? ''] ??
PenButtonAction.eraser,
pressureGamma:
(json['pressureGamma'] as num?)?.toDouble() ?? kNaturalPressureGamma,
palmRejectionMs: (json['palmRejectionMs'] as num?)?.toDouble() ?? 150.0,
fingerDrawing: json['fingerDrawing'] as bool? ?? false,
penWidth: (json['penWidth'] as num?)?.toDouble() ?? 0.004,
highlighterWidth: (json['highlighterWidth'] as num?)?.toDouble() ?? 0.02,
pressureSensitivity:
(json['pressureSensitivity'] as num?)?.toDouble() ?? kDefaultPenThinning,
eraserRadius:
(json['eraserRadius'] as num?)?.toDouble() ?? kDefaultEraserRadius,
eraserWholeStroke: json['eraserWholeStroke'] as bool? ?? false,
);
}
@override
bool operator ==(Object other) =>
identical(this, other) ||
other is PenConfig &&
runtimeType == other.runtimeType &&
sideButton == other.sideButton &&
eraserEnd == other.eraserEnd &&
pressureGamma == other.pressureGamma &&
palmRejectionMs == other.palmRejectionMs &&
fingerDrawing == other.fingerDrawing &&
penWidth == other.penWidth &&
highlighterWidth == other.highlighterWidth &&
pressureSensitivity == other.pressureSensitivity &&
eraserRadius == other.eraserRadius &&
eraserWholeStroke == other.eraserWholeStroke;
@override
int get hashCode => Object.hash(
sideButton,
eraserEnd,
pressureGamma,
palmRejectionMs,
fingerDrawing,
penWidth,
highlighterWidth,
pressureSensitivity,
eraserRadius,
eraserWholeStroke,
);
}
/// Applies a gamma power curve to a raw pressure value.
///
/// Returns `pressure.clamp(0, 1) ^ gamma` as a [double].
double applyPressureCurve(double pressure, double gamma) =>
pow(pressure.clamp(0.0, 1.0), gamma).toDouble();
/// Manages [PenConfig] persistence and live updates.
///
/// Load with [PenConfigController.load], then listen to changes via
/// [ChangeNotifier]. Setters immediately update the in-memory value,
/// notify listeners, and persist to SharedPreferences.
class PenConfigController extends ChangeNotifier {
PenConfigController._(this._prefs, this._value);
/// The SharedPreferences key under which [PenConfig] JSON is stored.
static const prefsKey = 'pen_config_v1';
/// Marker so the legacy-gamma migration in [load] runs at most once.
static const _gammaMigratedKey = 'pen_config_gamma_migrated_v1';
final SharedPreferences _prefs;
PenConfig _value;
/// The current pen configuration.
PenConfig get value => _value;
/// Loads persisted config from SharedPreferences. Falls back to defaults
/// if no config has been saved yet or if the stored JSON is invalid.
static Future<PenConfigController> load() async {
final prefs = await SharedPreferences.getInstance();
final raw = prefs.getString(prefsKey);
PenConfig config;
if (raw == null) {
config = const PenConfig();
} else {
try {
config = PenConfig.fromJson(
jsonDecode(raw) as Map<String, dynamic>,
);
} catch (_) {
config = const PenConfig();
}
}
// One-time migration: before this build, pressureGamma was never applied to
// strokes (a dead slider), so a stored 1.0 is the legacy inert default, not
// a deliberate "linear feel" choice. Upgrade it ONCE to the natural curve so
// the pen feels right out of the box. Guarded by a marker key so that, after
// migrating, the user is free to set gamma back to 1.0 and have it stick.
if (!(prefs.getBool(_gammaMigratedKey) ?? false)) {
if (config.pressureGamma == 1.0) {
config = config.copyWith(pressureGamma: kNaturalPressureGamma);
await prefs.setString(prefsKey, jsonEncode(config.toJson()));
}
await prefs.setBool(_gammaMigratedKey, true);
}
return PenConfigController._(prefs, config);
}
Future<void> _persist() async {
await _prefs.setString(prefsKey, jsonEncode(_value.toJson()));
}
Future<void> setSideButton(PenButtonAction action) async {
_value = _value.copyWith(sideButton: action);
notifyListeners();
await _persist();
}
Future<void> setEraserEnd(PenButtonAction action) async {
_value = _value.copyWith(eraserEnd: action);
notifyListeners();
await _persist();
}
/// Sets [PenConfig.pressureGamma]. Clamped to [0.3, 3.0].
Future<void> setPressureGamma(double gamma) async {
_value = _value.copyWith(pressureGamma: gamma.clamp(0.3, 3.0));
notifyListeners();
await _persist();
}
/// Sets [PenConfig.palmRejectionMs]. Clamped to [0, 500].
Future<void> setPalmRejectionMs(double ms) async {
_value = _value.copyWith(palmRejectionMs: ms.clamp(0.0, 500.0));
notifyListeners();
await _persist();
}
Future<void> setFingerDrawing(bool enabled) async {
_value = _value.copyWith(fingerDrawing: enabled);
notifyListeners();
await _persist();
}
Future<void> setPenWidth(double width) async {
_value = _value.copyWith(penWidth: width);
notifyListeners();
await _persist();
}
Future<void> setHighlighterWidth(double width) async {
_value = _value.copyWith(highlighterWidth: width);
notifyListeners();
await _persist();
}
/// Sets [PenConfig.pressureSensitivity]. Clamped to [0, 1].
/// Sets [PenConfig.eraserRadius]. Clamped to [0.005, 0.1].
Future<void> setEraserRadius(double radius) async {
_value = _value.copyWith(eraserRadius: radius.clamp(0.005, 0.1));
await _persist();
}
/// Sets [PenConfig.eraserWholeStroke] (true = OneNote-style stroke eraser).
Future<void> setEraserWholeStroke(bool whole) async {
_value = _value.copyWith(eraserWholeStroke: whole);
await _persist();
}
Future<void> setPressureSensitivity(double sensitivity) async {
_value = _value.copyWith(pressureSensitivity: sensitivity.clamp(0.0, 1.0));
notifyListeners();
await _persist();
}
}