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

Move ClipRRect logic from Card to Material (fixes rounded corners on top of date picker dialog)

Browse Source
This commit is contained in:
Collin Jackson 2015-08-26 11:06:22 -07:00
parent 1a15cb2d27
commit d547103f6a
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/flutter/lib/widgets/card.dart
View File

@ -23,11 +23,7 @@ class Card extends Component {
color: color,
type: MaterialType.card,
level: 2,
child: new ClipRRect(
xRadius: edges[MaterialType.card],
yRadius: edges[MaterialType.card],
child: child
)
child: child
)
);
}

19
packages/flutter/lib/widgets/material.dart
View File

@ -48,6 +48,20 @@ class Material extends Component {
}
Widget build() {
Widget contents = child;
if (child != null) {
contents = new DefaultTextStyle(
style: Theme.of(this).text.body1,
child: contents
);
if (edges[type] != null) {
contents = new ClipRRect(
xRadius: edges[type],
yRadius: edges[type],
child: contents
);
}
}
return new AnimatedContainer(
behavior: implicitlyAnimate(const Duration(milliseconds: 200)),
decoration: new BoxDecoration(
@ -56,10 +70,7 @@ class Material extends Component {
boxShadow: level == 0 ? null : shadows[level],
shape: type == MaterialType.circle ? Shape.circle : Shape.rectangle
),
child: child == null ? null : new DefaultTextStyle(
style: Theme.of(this).text.body1,
child: child
)
child: contents
);
}
}