From 2856617d4cb22aa9c70a4af99e25d1647f4d2cc4 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Tue, 23 Jun 2015 14:19:00 -0700 Subject: [PATCH] Add a confirmation dialog to stock app Settings page and style it by default R=ianh@google.com, abarth, hixie Review URL: https://codereview.chromium.org/1201273002. --- .../tests/widgets/buttons-expected.txt | 2 +- .../flutter/tests/widgets/dialog-expected.txt | 22 +++++++++++++------ engine/src/flutter/tests/widgets/dialog.dart | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/engine/src/flutter/tests/widgets/buttons-expected.txt b/engine/src/flutter/tests/widgets/buttons-expected.txt index 9bbce11fa9..49c0d9a7cb 100644 --- a/engine/src/flutter/tests/widgets/buttons-expected.txt +++ b/engine/src/flutter/tests/widgets/buttons-expected.txt @@ -27,7 +27,7 @@ PAINT FOR FRAME #3 ---------------------------------------------- 3 | | | TestDisplayList() constructor: 800.0 x 600.0 3 | | | paintChild RenderConstrainedBox at Point(8.0, 8.0) 3 | | | | TestDisplayList() constructor: 800.0 x 600.0 -3 | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xfffafafa))) +3 | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0x00000000))) 3 | | | | paintChild RenderPositionedBox at Point(8.0, 0.0) 3 | | | | | TestDisplayList() constructor: 800.0 x 600.0 3 | | | | | paintChild RenderParagraph at Point(6.0, 10.0) diff --git a/engine/src/flutter/tests/widgets/dialog-expected.txt b/engine/src/flutter/tests/widgets/dialog-expected.txt index 54846bf81d..c77844d68e 100644 --- a/engine/src/flutter/tests/widgets/dialog-expected.txt +++ b/engine/src/flutter/tests/widgets/dialog-expected.txt @@ -13,14 +13,22 @@ PAINT FOR FRAME #2 ---------------------------------------------- 2 | | | drawRect(Rect.fromLTRB(0.0, 0.0, 800.0, 600.0), Paint(color:Color(0x7f000000))) 2 | | paintChild RenderPositionedBox at Point(0.0, 0.0) 2 | | | TestDisplayList() constructor: 800.0 x 600.0 -2 | | | paintChild RenderConstrainedBox at Point(260.0, 276.0) +2 | | | paintChild RenderPadding at Point(220.0, 212.5) 2 | | | | TestDisplayList() constructor: 800.0 x 600.0 -2 | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffffffff), drawLooper:true)) -2 | | | | paintChild RenderParagraph at Point(0.0, 0.0) -2 | | | | | TestDisplayList() constructor: 800.0 x 600.0 -2 | | | | paintChild RenderParagraph at Point(0.0, 16.0) -2 | | | | | TestDisplayList() constructor: 800.0 x 600.0 -2 | | | | paintChild RenderParagraph at Point(0.0, 32.0) +2 | | | | paintChild RenderConstrainedBox at Point(40.0, 24.0) 2 | | | | | TestDisplayList() constructor: 800.0 x 600.0 +2 | | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffffffff), drawLooper:true)) +2 | | | | | paintChild RenderPadding at Point(0.0, 0.0) +2 | | | | | | TestDisplayList() constructor: 800.0 x 600.0 +2 | | | | | | paintChild RenderParagraph at Point(24.0, 24.0) +2 | | | | | | | TestDisplayList() constructor: 800.0 x 600.0 +2 | | | | | paintChild RenderPadding at Point(0.0, 48.0) +2 | | | | | | TestDisplayList() constructor: 800.0 x 600.0 +2 | | | | | | paintChild RenderParagraph at Point(24.0, 20.0) +2 | | | | | | | TestDisplayList() constructor: 800.0 x 600.0 +2 | | | | | paintChild RenderFlex at Point(0.0, 111.0) +2 | | | | | | TestDisplayList() constructor: 800.0 x 600.0 +2 | | | | | | paintChild RenderParagraph at Point(151.0, 0.0) +2 | | | | | | | TestDisplayList() constructor: 800.0 x 600.0 ------------------------------------------------------------------------ PAINTED 2 FRAMES diff --git a/engine/src/flutter/tests/widgets/dialog.dart b/engine/src/flutter/tests/widgets/dialog.dart index b51891bfb6..abbc5f08c2 100644 --- a/engine/src/flutter/tests/widgets/dialog.dart +++ b/engine/src/flutter/tests/widgets/dialog.dart @@ -14,7 +14,7 @@ main() async { return new Dialog( title: new Text("I am a title"), content: new Text("I am some content"), - actions: new Text("I am some actions") + actions: [new Text("I am some actions")] ); });