From 50c04c5c444215fae4fe04661232d38f00ed82b7 Mon Sep 17 00:00:00 2001
From: Aleksei <130981115+MacDeveloper1@users.noreply.github.com>
Date: Tue, 19 Dec 2023 12:54:41 +0100
Subject: [PATCH] Restore old feel&look of buttons

---
 .../toolbar/buttons/clear_format_button.dart     |  9 ++++++++-
 .../toolbar/buttons/color/color_button.dart      | 16 ++++++++++------
 .../widgets/toolbar/buttons/indent_button.dart   |  9 ++++++++-
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/lib/src/widgets/toolbar/buttons/clear_format_button.dart b/lib/src/widgets/toolbar/buttons/clear_format_button.dart
index 0864b310..bb8c5d17 100644
--- a/lib/src/widgets/toolbar/buttons/clear_format_button.dart
+++ b/lib/src/widgets/toolbar/buttons/clear_format_button.dart
@@ -107,10 +107,17 @@ class QuillToolbarClearFormatButton extends StatelessWidget {
     final theme = Theme.of(context);
 
     final iconColor = iconTheme?.iconUnselectedColor ?? theme.iconTheme.color;
+    final iconFillColor =
+        iconTheme?.iconUnselectedFillColor ?? theme.canvasColor;
 
     return QuillToolbarIconButton(
       tooltip: tooltip,
-      icon: Icon(iconData, size: iconSize * iconButtonFactor, color: iconColor),
+      highlightElevation: 0,
+      hoverElevation: 0,
+      size: iconSize * iconButtonFactor,
+      icon: Icon(iconData, size: iconSize, color: iconColor),
+      fillColor: iconFillColor,
+      borderRadius: iconTheme?.borderRadius ?? 2,
       onPressed: _sharedOnPressed,
       afterPressed: afterButtonPressed,
     );
diff --git a/lib/src/widgets/toolbar/buttons/color/color_button.dart b/lib/src/widgets/toolbar/buttons/color/color_button.dart
index b4d03e3f..c86ca4ee 100644
--- a/lib/src/widgets/toolbar/buttons/color/color_button.dart
+++ b/lib/src/widgets/toolbar/buttons/color/color_button.dart
@@ -194,14 +194,18 @@ class QuillToolbarColorButtonState extends State<QuillToolbarColorButton> {
       );
     }
 
-    return IconButton(
+    return QuillToolbarIconButton(
       tooltip: tooltip,
-      iconSize: iconSize * iconButtonFactor,
-      icon: Icon(
-        iconData,
-        color: widget.isBackground ? iconColorBackground : iconColor,
-      ),
+      highlightElevation: 0,
+      hoverElevation: 0,
+      size: iconSize * iconButtonFactor,
+      icon: Icon(iconData,
+          size: iconSize,
+          color: widget.isBackground ? iconColorBackground : iconColor),
+      fillColor: widget.isBackground ? fillColorBackground : fillColor,
+      borderRadius: iconTheme?.borderRadius ?? 2,
       onPressed: _showColorPicker,
+      afterPressed: afterButtonPressed,
     );
   }
 
diff --git a/lib/src/widgets/toolbar/buttons/indent_button.dart b/lib/src/widgets/toolbar/buttons/indent_button.dart
index 35b46a76..9fe1891c 100644
--- a/lib/src/widgets/toolbar/buttons/indent_button.dart
+++ b/lib/src/widgets/toolbar/buttons/indent_button.dart
@@ -107,9 +107,16 @@ class QuillToolbarIndentButtonState extends State<QuillToolbarIndentButton> {
     final theme = Theme.of(context);
 
     final iconColor = iconTheme?.iconUnselectedColor ?? theme.iconTheme.color;
+    final iconFillColor =
+        iconTheme?.iconUnselectedFillColor ?? theme.canvasColor;
     return QuillToolbarIconButton(
       tooltip: tooltip,
-      icon: Icon(iconData, size: iconSize * iconButtonFactor, color: iconColor),
+      highlightElevation: 0,
+      hoverElevation: 0,
+      size: iconSize * iconButtonFactor,
+      icon: Icon(iconData, size: iconSize, color: iconColor),
+      fillColor: iconFillColor,
+      borderRadius: iconTheme?.borderRadius ?? 2,
       onPressed: _sharedOnPressed,
       afterPressed: afterButtonPressed,
     );