Skip to content

Commit 9dddfd2

Browse files
committed
Fix polygon tool color picker has no eyedropper button, closes #1121
1 parent 90b31d2 commit 9dddfd2

4 files changed

Lines changed: 17 additions & 3 deletions

File tree

api/pubspec.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,10 @@ packages:
319319
dependency: transitive
320320
description:
321321
name: meta
322-
sha256: df0c643f44ad098eb37988027a8e2b2b5a031fd3977f06bbfd3a76637e8df739
322+
sha256: c82594181e3312f3d0695fc95aaaf7758d75b8d4ae2bbecf223b9fd5109a059d
323323
url: "https://pub.dev"
324324
source: hosted
325-
version: "1.18.2"
325+
version: "1.18.3"
326326
mime:
327327
dependency: transitive
328328
description:

app/lib/handlers/polygon.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ class PolygonHandler extends Handler<PolygonTool> with ColoredHandler {
448448
PreferredSizeWidget? getToolbar(DocumentBloc bloc) {
449449
final element = _element;
450450
return PolygonToolbarView(
451+
bloc: bloc,
451452
tool: element == null ? data : data.copyWith(property: element.property),
452453
hasPoints: (element?.points.length ?? 0) > 0,
453454
onToolChanged: (tool) => _changeTool(bloc, tool),

app/lib/views/toolbar/polygon.dart

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import 'package:butterfly/bloc/document_bloc.dart';
2+
import 'package:butterfly/cubits/current_index.dart';
13
import 'package:butterfly/src/generated/i18n/app_localizations.dart';
24
import 'package:butterfly/views/toolbar/color.dart';
35
import 'package:butterfly_api/butterfly_api.dart';
@@ -9,10 +11,12 @@ class PolygonToolbarView extends StatelessWidget
911
final PolygonTool tool;
1012
final ValueChanged<PolygonTool> onToolChanged;
1113
final bool hasPoints;
14+
final DocumentBloc bloc;
1215
final VoidCallback? onFinishShape, onSubmit, onDelete;
1316

1417
const PolygonToolbarView({
1518
super.key,
19+
required this.bloc,
1620
required this.tool,
1721
required this.onToolChanged,
1822
required this.onFinishShape,
@@ -28,6 +32,14 @@ class PolygonToolbarView extends StatelessWidget
2832
onChanged: (value) => onToolChanged.call(
2933
tool.copyWith(property: tool.property.copyWith(color: value)),
3034
),
35+
onEyeDropper: (context) {
36+
bloc.currentIndexCubit.changeTemporaryHandler(
37+
context,
38+
EyeDropperTool(),
39+
bloc: bloc,
40+
temporaryState: TemporaryState.removeAfterRelease,
41+
);
42+
},
3143
strokeWidth: tool.property.strokeWidth,
3244
onStrokeWidthChanged: (value) => onToolChanged.call(
3345
tool.copyWith(property: tool.property.copyWith(strokeWidth: value)),

metadata/en-US/changelogs/185.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
* Fix PDF spread-to-pages imports rendering as gray placeholders ([#1123](https://github.com/LinwoodDev/Butterfly/issues/1123))
2-
* Fix PDF import using the first pages instead of the selected pages ([#1124](https://github.com/LinwoodDev/Butterfly/issues/1124))
2+
* Fix PDF import using the first pages instead of the selected pages ([#1124](https://github.com/LinwoodDev/Butterfly/issues/1124))
3+
* Fix polygon tool color picker has no eyedropper button ([#1121](https://github.com/LinwoodDev/Butterfly/issues/1121))

0 commit comments

Comments
 (0)