Fix disabled color foreground on FilledButton (#209)

bdlukaa · Mar 7, 2022 · 4c0f254 · 4c0f254
2 parents e5a948f + 65bd0fa
commit 4c0f254
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 Date format: DD/MM/YYYY
 
+## [3.9.2] [dd/mm/yyyy]
+
+- Fix: [#207](https://github.com/bdlukaa/fluent_ui/pull/207) FilledButton disabled foreground
+
 ## [3.9.1] - Input Update - [25/02/2022]
 
 - `TextBox` updates: ([#179](https://github.com/bdlukaa/fluent_ui/pull/179))

diff --git a/example/lib/screens/inputs.dart b/example/lib/screens/inputs.dart
@@ -139,6 +139,11 @@ class _InputsPageState extends State<InputsPage> {
                   },
           ),
           spacer,
+          FilledButton(
+            child: const Text('Filled Button'),
+            onPressed: disabled ? null : () => print('pressed filled button'),
+          ),
+          spacer,
           IconButton(
             icon: const Icon(FluentIcons.add),
             onPressed: disabled ? null : () => print('pressed icon button'),

diff --git a/lib/src/controls/inputs/buttons/filled_button.dart b/lib/src/controls/inputs/buttons/filled_button.dart
@@ -36,13 +36,20 @@ class FilledButton extends Button {
     return ButtonStyle(backgroundColor: ButtonState.resolveWith((states) {
       return backgroundColor(theme, states);
     }), foregroundColor: ButtonState.resolveWith((states) {
+      if (states.isDisabled) {
+        return theme.brightness.isDark ? theme.disabledColor : Colors.white;
+      }
       return backgroundColor(theme, states).basedOnLuminance();
     }));
   }
 
   static Color backgroundColor(ThemeData theme, Set<ButtonStates> states) {
     if (states.isDisabled) {
-      return ButtonThemeData.buttonColor(theme.brightness, states);
+      if (theme.brightness.isDark) {
+        return const Color(0xFF434343);
+      } else {
+        return const Color(0xFFBFBFBF);
+      }
     } else if (states.isPressing) {
       if (theme.brightness.isDark) {
         return theme.accentColor.darker;