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

BoxDecoration borders define padding

Browse Source
This commit is contained in:
Hans Muller 2016-03-03 16:39:13 -08:00
parent 9b7ee3b7cc
commit d04ab2e001
5 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter/lib/src/material/two_level_list.dart
View File

@ -110,7 +110,7 @@ class _TwoLevelSublistState extends State<TwoLevelSublist> {
onTap: _handleOnTap, onTap: _handleOnTap,
left: config.left, left: config.left,
center: new DefaultTextStyle( center: new DefaultTextStyle(
style: Theme.of(context).text.body1.copyWith(color: _headerColor.evaluate(_easeInAnimation)), style: Theme.of(context).text.subhead.copyWith(color: _headerColor.evaluate(_easeInAnimation)),
child: config.center child: config.center
), ),
right: new RotationTransition( right: new RotationTransition(
@ -136,7 +136,7 @@ class _TwoLevelSublistState extends State<TwoLevelSublist> {
final ThemeData theme = Theme.of(context); final ThemeData theme = Theme.of(context);
_borderColor.end = theme.dividerColor; _borderColor.end = theme.dividerColor;
_headerColor _headerColor
..begin = theme.text.body1.color ..begin = theme.text.subhead.color
..end = theme.accentColor; ..end = theme.accentColor;
_iconColor _iconColor
..begin = theme.unselectedColor ..begin = theme.unselectedColor

3
packages/flutter/lib/src/painting/box_painter.dart
View File

@ -793,6 +793,9 @@ class BoxDecoration extends Decoration {
/// The shape to fill the background color into and to cast as a shadow. /// The shape to fill the background color into and to cast as a shadow.
final BoxShape shape; final BoxShape shape;
/// The inset space occupied by the border.
EdgeDims get padding => border?.dimensions;
/// Returns a new box decoration that is scaled by the given factor. /// Returns a new box decoration that is scaled by the given factor.
BoxDecoration scale(double factor) { BoxDecoration scale(double factor) {
// TODO(abarth): Scale ALL the things. // TODO(abarth): Scale ALL the things.

1
packages/flutter/lib/src/widgets/basic.dart
View File

@ -109,6 +109,7 @@ class ShaderMask extends OneChildRenderObjectWidget {
} }
/// Paints a [Decoration] either before or after its child paints. /// Paints a [Decoration] either before or after its child paints.
/// Container insets its child by the widths of the borders, this Widget does not.
/// ///
/// Commonly used with [BoxDecoration]. /// Commonly used with [BoxDecoration].
class DecoratedBox extends OneChildRenderObjectWidget { class DecoratedBox extends OneChildRenderObjectWidget {

19
packages/flutter/test/widget/box_decoration_test.dart
View File

@ -22,4 +22,23 @@ void main() {
); );
}); });
}); });
test('Bordered Container insets its child', () {
testWidgets((WidgetTester tester) {
Key key = new Key('outerContainer');
tester.pumpWidget(
new Center(
child: new Container(
key: key,
decoration: new BoxDecoration(border: new Border.all(width: 10.0)),
child: new Container(
width: 25.0,
height: 25.0
)
)
)
);
expect(tester.getSize(tester.findElementByKey(key)), equals(const Size(45.0, 45.0)));
});
});
} }

5
packages/flutter/test/widget/two_level_list_test.dart
View File

@ -49,8 +49,9 @@ void main() {
expect(getY(topKey), lessThan(getY(sublistKey))); expect(getY(topKey), lessThan(getY(sublistKey)));
expect(getY(sublistKey), lessThan(getY(bottomKey))); expect(getY(sublistKey), lessThan(getY(bottomKey)));
expect(getHeight(topKey), equals(getHeight(sublistKey))); // The sublist has a one pixel border above and below.
expect(getHeight(sublistKey), equals(getHeight(bottomKey))); expect(getHeight(topKey), equals(getHeight(sublistKey) - 2.0));
expect(getHeight(bottomKey), equals(getHeight(sublistKey) - 2.0));
tester.tap(tester.findText('Sublist')); tester.tap(tester.findText('Sublist'));
tester.pump(const Duration(seconds: 1)); tester.pump(const Duration(seconds: 1));