File tree Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -16,7 +16,6 @@ import 'package:saber/data/extensions/color_extensions.dart';
16
16
import 'package:saber/data/file_manager/file_manager.dart' ;
17
17
import 'package:saber/data/prefs.dart' ;
18
18
import 'package:saber/data/routes.dart' ;
19
- import 'package:saber/i18n/strings.g.dart' ;
20
19
import 'package:saber/pages/editor/editor.dart' ;
21
20
22
21
class PreviewCard extends StatefulWidget {
Original file line number Diff line number Diff line change @@ -94,7 +94,7 @@ class _PenModalState extends State<PenModal> {
94
94
),
95
95
IconButton (
96
96
onPressed: () => setState (() {
97
- widget.setTool (ShapePen .currentShapePen );
97
+ widget.setTool (ShapePen () );
98
98
}),
99
99
style: TextButton .styleFrom (
100
100
foregroundColor: Pen .currentPen.icon == ShapePen .shapePenIcon
Original file line number Diff line number Diff line change @@ -24,8 +24,6 @@ class ShapePen extends Pen {
24
24
strokeProperties = Prefs .lastShapePenProperties.value;
25
25
}
26
26
27
- static Pen currentShapePen = ShapePen ();
28
-
29
27
static final log = Logger ('ShapePen' );
30
28
31
29
static const IconData shapePenIcon = FontAwesomeIcons .shapes;
Original file line number Diff line number Diff line change @@ -138,10 +138,13 @@ class EditorState extends State<Editor> {
138
138
Pen .currentPen = Pen .ballpointPen ();
139
139
}
140
140
return Pen .currentPen;
141
+ case ToolId .shapePen:
142
+ if (Pen .currentPen.toolId != Prefs .lastTool.value) {
143
+ Pen .currentPen = ShapePen ();
144
+ }
145
+ return Pen .currentPen;
141
146
case ToolId .highlighter:
142
147
return Highlighter .currentHighlighter;
143
- case ToolId .shapePen:
144
- return ShapePen .currentShapePen;
145
148
case ToolId .eraser:
146
149
return Eraser ();
147
150
case ToolId .select:
You can’t perform that action at this time.
0 commit comments