Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
73687a97
Unverified
Commit
73687a97
authored
Apr 05, 2019
by
Hans Muller
Committed by
GitHub
Apr 05, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct MaterialButton disabledColor (#30531)
parent
d15b3b1c
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
331 additions
and
2 deletions
+331
-2
button_theme.dart
packages/flutter/lib/src/material/button_theme.dart
+1
-1
material_button.dart
packages/flutter/lib/src/material/material_button.dart
+1
-1
buttons_test.dart
packages/flutter/test/material/buttons_test.dart
+329
-0
No files found.
packages/flutter/lib/src/material/button_theme.dart
View file @
73687a97
...
...
@@ -491,7 +491,7 @@ class ButtonThemeData extends Diagnosticable {
if
(
fillColor
!=
null
)
return
fillColor
;
if
(
button
is
FlatButton
||
button
is
OutlineButton
)
if
(
button
is
FlatButton
||
button
is
OutlineButton
||
button
.
runtimeType
==
MaterialButton
)
return
null
;
if
(
button
.
enabled
&&
button
is
RaisedButton
&&
_buttonColor
!=
null
)
...
...
packages/flutter/lib/src/material/material_button.dart
View file @
73687a97
...
...
@@ -263,7 +263,7 @@ class MaterialButton extends StatelessWidget {
return
RawMaterialButton
(
onPressed:
onPressed
,
onHighlightChanged:
onHighlightChanged
,
fillColor:
color
,
fillColor:
buttonTheme
.
getFillColor
(
this
)
,
textStyle:
theme
.
textTheme
.
button
.
copyWith
(
color:
buttonTheme
.
getTextColor
(
this
)),
highlightColor:
highlightColor
??
theme
.
highlightColor
,
splashColor:
splashColor
??
theme
.
splashColor
,
...
...
packages/flutter/test/material/buttons_test.dart
View file @
73687a97
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment