firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflict. (#25718)

Browse Source
This commit is contained in:
Ian Hickson 2018-12-23 11:13:53 -08:00 committed by GitHub
parent c0b20a76de
commit 273364e2bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/flutter/lib/src/material/input_decorator.dart
View File

@ -2691,7 +2691,7 @@ class InputDecoration {
@override @override
int get hashCode { int get hashCode {
// Split into two hashValues calls because the hashValues function is // Split into several hashValues calls because the hashValues function is
// limited to 20 parameters. // limited to 20 parameters.
return hashValues( return hashValues(
icon, icon,
@ -2713,8 +2713,8 @@ class InputDecoration {
fillColor, fillColor,
border, border,
enabled, enabled,
prefixIcon,
hashValues( hashValues(
prefixIcon,
prefix, prefix,
prefixText, prefixText,
prefixStyle, prefixStyle,
@ -2733,9 +2733,11 @@ class InputDecoration {
enabledBorder, enabledBorder,
border, border,
enabled, enabled,
hashValues(
semanticCounterText, semanticCounterText,
alignLabelWithHint, alignLabelWithHint,
), ),
),
); );
} }