commit 646d2b0139853b186930954b75d16e83b18d8e9f
author Dan Field <dnfield@google.com> Fri Feb 28 12:01:03 2020 -0800
committer GitHub <noreply@github.com> Fri Feb 28 12:01:03 2020 -0800
tree 312c4be0e2b5d66c13a1e10da879d008a534d4d7
parent 515027a91c244f2fce47aa446939756445b8de27

properties (#51650)

packages/flutter/lib/src/widgets/basic.dart

diff --git a/packages/flutter/lib/src/widgets/basic.dart b/packages/flutter/lib/src/widgets/basic.dart
index a337852..978cdc4 100644
--- a/packages/flutter/lib/src/widgets/basic.dart
+++ b/packages/flutter/lib/src/widgets/basic.dart
@@ -7094,6 +7094,12 @@
   void updateRenderObject(BuildContext context, _RenderColoredBox renderObject) {
     renderObject.color = color;
   }
+
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    super.debugFillProperties(properties);
+    properties.add(DiagnosticsProperty<Color>('color', color));
+  }
 }
 
 class _RenderColoredBox extends RenderProxyBoxWithHitTestBehavior {

packages/flutter/lib/src/widgets/container.dart

diff --git a/packages/flutter/lib/src/widgets/container.dart b/packages/flutter/lib/src/widgets/container.dart
index 92f2ac3..6298e68 100644
--- a/packages/flutter/lib/src/widgets/container.dart
+++ b/packages/flutter/lib/src/widgets/container.dart
@@ -473,7 +473,10 @@
     properties.add(DiagnosticsProperty<AlignmentGeometry>('alignment', alignment, showName: false, defaultValue: null));
     properties.add(DiagnosticsProperty<EdgeInsetsGeometry>('padding', padding, defaultValue: null));
     properties.add(DiagnosticsProperty<Clip>('clipBehavior', clipBehavior, defaultValue: Clip.none));
-    properties.add(DiagnosticsProperty<Decoration>('bg', decoration, defaultValue: null));
+    if (color != null)
+      properties.add(DiagnosticsProperty<Color>('bg', color));
+    else
+      properties.add(DiagnosticsProperty<Decoration>('bg', decoration, defaultValue: null));
     properties.add(DiagnosticsProperty<Decoration>('fg', foregroundDecoration, defaultValue: null));
     properties.add(DiagnosticsProperty<BoxConstraints>('constraints', constraints, defaultValue: null));
     properties.add(DiagnosticsProperty<EdgeInsetsGeometry>('margin', margin, defaultValue: null));

packages/flutter/test/widgets/basic_test.dart

diff --git a/packages/flutter/test/widgets/basic_test.dart b/packages/flutter/test/widgets/basic_test.dart
index 69b0fd9..7ac0b4f 100644
--- a/packages/flutter/test/widgets/basic_test.dart
+++ b/packages/flutter/test/widgets/basic_test.dart
@@ -361,7 +361,15 @@
       expect(drawRect[0], const Rect.fromLTWH(0, 0, 800, 600));
       expect(drawRect[1].color, colorToPaint);
       verify(mockContext.paintChild(renderSizedBox, Offset.zero)).called(1);
-      });
+    });
+
+    testWidgets('ColoredBox - properties', (WidgetTester tester) async {
+      const ColoredBox box = ColoredBox(color: colorToPaint);
+      final DiagnosticPropertiesBuilder properties = DiagnosticPropertiesBuilder();
+      box.debugFillProperties(properties);
+
+      expect(properties.properties.first.value, colorToPaint);
+    });
   });
 }