From 14d768322ad00948b7cd095fc3262a19d26e0adf Mon Sep 17 00:00:00 2001 From: Ellet Date: Wed, 13 Dec 2023 00:43:30 +0300 Subject: [PATCH] Update select header style button --- .../presentation/quill/my_quill_toolbar.dart | 1 + .../toolbar/buttons/color/color_button.dart | 1 + .../select_header_style_button.dart | 21 +++++++++++++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/example/lib/presentation/quill/my_quill_toolbar.dart b/example/lib/presentation/quill/my_quill_toolbar.dart index 75bb23be..8430f787 100644 --- a/example/lib/presentation/quill/my_quill_toolbar.dart +++ b/example/lib/presentation/quill/my_quill_toolbar.dart @@ -205,6 +205,7 @@ class MyQuillToolbar extends StatelessWidget { base: QuillToolbarBaseButtonOptions( // Request editor focus when any button is pressed afterButtonPressed: focusNode.requestFocus, + globalIconSize: 30, ), ), customButtons: [ diff --git a/lib/src/widgets/toolbar/buttons/color/color_button.dart b/lib/src/widgets/toolbar/buttons/color/color_button.dart index 2140afc4..b4d03e3f 100644 --- a/lib/src/widgets/toolbar/buttons/color/color_button.dart +++ b/lib/src/widgets/toolbar/buttons/color/color_button.dart @@ -32,6 +32,7 @@ class QuillToolbarColorButton extends StatefulWidget { QuillToolbarColorButtonState createState() => QuillToolbarColorButtonState(); } +// TODO: This button shouldn't require anything to use it class QuillToolbarColorButtonState extends State { late bool _isToggledColor; late bool _isToggledBackground; diff --git a/lib/src/widgets/toolbar/buttons/hearder_style/select_header_style_button.dart b/lib/src/widgets/toolbar/buttons/hearder_style/select_header_style_button.dart index 27a51319..f8cde7de 100644 --- a/lib/src/widgets/toolbar/buttons/hearder_style/select_header_style_button.dart +++ b/lib/src/widgets/toolbar/buttons/hearder_style/select_header_style_button.dart @@ -1,9 +1,11 @@ import 'package:flutter/material.dart'; import '../../../../../translations.dart'; +import '../../../../extensions/quill_configurations_ext.dart'; import '../../../../models/config/toolbar/buttons/select_header_style_configurations.dart'; import '../../../../models/documents/attribute.dart'; import '../../../quill/quill_controller.dart'; +import '../../base_toolbar.dart'; enum _HeaderStyleOptions { normal, @@ -20,7 +22,6 @@ class QuillToolbarSelectHeaderStyleButton extends StatefulWidget { }); final QuillController controller; - // TODO: Needs to be reviewed final QuillToolbarSelectHeaderStyleButtonsOptions options; @override @@ -109,6 +110,19 @@ class _QuillToolbarSelectHeaderStyleButtonState }; } + double get iconSize { + final baseFontSize = context.quillToolbarBaseButtonOptions?.globalIconSize; + final iconSize = widget.options.iconSize; + return iconSize ?? baseFontSize ?? kDefaultIconSize; + } + + double get iconButtonFactor { + final baseIconFactor = + context.quillToolbarBaseButtonOptions?.globalIconButtonFactor; + final iconButtonFactor = widget.options.iconButtonFactor; + return iconButtonFactor ?? baseIconFactor ?? kIconButtonFactor; + } + @override Widget build(BuildContext context) { return MenuAnchor( @@ -136,7 +150,10 @@ class _QuillToolbarSelectHeaderStyleButtonState mainAxisSize: MainAxisSize.min, children: [ Text(_label(_selectedItem)), - const Icon(Icons.arrow_drop_down), + Icon( + Icons.arrow_drop_down, + size: iconSize * iconButtonFactor, + ), ], ), ),