Skip to content

Commit 2bcdd98

Browse files
committed
fix: fix restoring current pen to shape pen
When the user restarts the app and their last used tool was the ShapePen, the last tool is successfully restored but `Pen.currentPen` isn't updated.
1 parent 765ae43 commit 2bcdd98

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

lib/components/home/preview_card.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import 'package:saber/data/extensions/color_extensions.dart';
1616
import 'package:saber/data/file_manager/file_manager.dart';
1717
import 'package:saber/data/prefs.dart';
1818
import 'package:saber/data/routes.dart';
19-
import 'package:saber/i18n/strings.g.dart';
2019
import 'package:saber/pages/editor/editor.dart';
2120

2221
class PreviewCard extends StatefulWidget {

lib/components/toolbar/pen_modal.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class _PenModalState extends State<PenModal> {
9494
),
9595
IconButton(
9696
onPressed: () => setState(() {
97-
widget.setTool(ShapePen.currentShapePen);
97+
widget.setTool(ShapePen());
9898
}),
9999
style: TextButton.styleFrom(
100100
foregroundColor: Pen.currentPen.icon == ShapePen.shapePenIcon

lib/data/tools/shape_pen.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ class ShapePen extends Pen {
2424
strokeProperties = Prefs.lastShapePenProperties.value;
2525
}
2626

27-
static Pen currentShapePen = ShapePen();
28-
2927
static final log = Logger('ShapePen');
3028

3129
static const IconData shapePenIcon = FontAwesomeIcons.shapes;

lib/pages/editor/editor.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,13 @@ class EditorState extends State<Editor> {
138138
Pen.currentPen = Pen.ballpointPen();
139139
}
140140
return Pen.currentPen;
141+
case ToolId.shapePen:
142+
if (Pen.currentPen.toolId != Prefs.lastTool.value) {
143+
Pen.currentPen = ShapePen();
144+
}
145+
return Pen.currentPen;
141146
case ToolId.highlighter:
142147
return Highlighter.currentHighlighter;
143-
case ToolId.shapePen:
144-
return ShapePen.currentShapePen;
145148
case ToolId.eraser:
146149
return Eraser();
147150
case ToolId.select:

0 commit comments

Comments
 (0)