提交 80d6a881 编写于 作者: H Hixie

Fix all the components to pick the right colours from the theme.

R=abarth@chromium.org

Review URL: https://codereview.chromium.org/1217573003.
上级 2f4e404f
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
// found in the LICENSE file. // found in the LICENSE file.
import 'package:sky/theme/colors.dart' as colors; import 'package:sky/theme/colors.dart' as colors;
import 'package:sky/theme/typography.dart' as typography;
import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/basic.dart';
import 'package:sky/widgets/default_text_style.dart';
import 'package:sky/widgets/navigator.dart'; import 'package:sky/widgets/navigator.dart';
import 'package:sky/widgets/theme.dart'; import 'package:sky/widgets/theme.dart';
import 'package:sky/widgets/widget.dart'; import 'package:sky/widgets/widget.dart';
...@@ -80,7 +82,10 @@ class StocksApp extends App { ...@@ -80,7 +82,10 @@ class StocksApp extends App {
return new Theme( return new Theme(
data: theme, data: theme,
child: new Navigator(_navigationState) child: new DefaultTextStyle(
style: typography.error, // if you see this, you've forgotten to correctly configure the text style!
child: new Navigator(_navigationState)
)
); );
} }
} }
......
...@@ -8,7 +8,6 @@ import 'package:sky/rendering/box.dart'; ...@@ -8,7 +8,6 @@ import 'package:sky/rendering/box.dart';
import 'package:sky/rendering/flex.dart'; import 'package:sky/rendering/flex.dart';
import 'package:sky/rendering/sky_binding.dart'; import 'package:sky/rendering/sky_binding.dart';
import 'package:sky/theme/colors.dart' as colors; import 'package:sky/theme/colors.dart' as colors;
import 'package:sky/theme/typography.dart' as typography;
import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/basic.dart';
import 'package:sky/widgets/material.dart'; import 'package:sky/widgets/material.dart';
import 'package:sky/widgets/raised_button.dart'; import 'package:sky/widgets/raised_button.dart';
......
...@@ -16,7 +16,7 @@ class TabbedNavigatorApp extends App { ...@@ -16,7 +16,7 @@ class TabbedNavigatorApp extends App {
Widget _buildContent(String label) { Widget _buildContent(String label) {
return new Center( return new Center(
child: new Text(label, style: const TextStyle(fontSize: 48.0, fontWeight: extraBold)) child: new Text(label, style: const TextStyle(fontSize: 48.0, fontWeight: FontWeight.w800))
); );
} }
......
...@@ -5,15 +5,8 @@ ...@@ -5,15 +5,8 @@
import 'dart:sky'; import 'dart:sky';
enum FontWeight { w100, w200, w300, w400, w500, w600, w700, w800, w900 } enum FontWeight { w100, w200, w300, w400, w500, w600, w700, w800, w900 }
const thin = FontWeight.w100;
const extraLight = FontWeight.w200;
const light = FontWeight.w300;
const normal = FontWeight.w400; const normal = FontWeight.w400;
const medium = FontWeight.w500;
const semiBold = FontWeight.w600;
const bold = FontWeight.w700; const bold = FontWeight.w700;
const extraBold = FontWeight.w800;
const black = FontWeight.w900;
enum TextAlign { left, right, center } enum TextAlign { left, right, center }
......
...@@ -14,13 +14,13 @@ class TextTheme { ...@@ -14,13 +14,13 @@ class TextTheme {
TextTheme._(Color color54, Color color87) TextTheme._(Color color54, Color color87)
: display4 = new TextStyle(fontSize: 112.0, fontWeight: FontWeight.w100, color: color54), : display4 = new TextStyle(fontSize: 112.0, fontWeight: FontWeight.w100, color: color54),
display3 = new TextStyle(fontSize: 56.0, fontWeight: FontWeight.w400, color: color54), display3 = new TextStyle(fontSize: 56.0, fontWeight: FontWeight.w400, color: color54),
display2 = new TextStyle(fontSize: 45.0, fontWeight: FontWeight.w400, color: color54), display2 = new TextStyle(fontSize: 45.0, fontWeight: FontWeight.w400, color: color54, height: 48.0 / 45.0),
display1 = new TextStyle(fontSize: 34.0, fontWeight: FontWeight.w400, color: color54), display1 = new TextStyle(fontSize: 34.0, fontWeight: FontWeight.w400, color: color54, height: 40.0 / 34.0),
headline = new TextStyle(fontSize: 24.0, fontWeight: FontWeight.w400, color: color87), headline = new TextStyle(fontSize: 24.0, fontWeight: FontWeight.w400, color: color87, height: 32.0 / 24.0),
title = new TextStyle(fontSize: 20.0, fontWeight: FontWeight.w500, color: color87), title = new TextStyle(fontSize: 20.0, fontWeight: FontWeight.w500, color: color87, height: 28.0 / 20.0),
subhead = new TextStyle(fontSize: 16.0, fontWeight: FontWeight.w400, color: color87), subhead = new TextStyle(fontSize: 16.0, fontWeight: FontWeight.w400, color: color87, height: 24.0 / 16.0),
body2 = new TextStyle(fontSize: 14.0, fontWeight: FontWeight.w500, color: color87), body2 = new TextStyle(fontSize: 14.0, fontWeight: FontWeight.w500, color: color87, height: 24.0 / 14.0),
body1 = new TextStyle(fontSize: 14.0, fontWeight: FontWeight.w400, color: color87), body1 = new TextStyle(fontSize: 14.0, fontWeight: FontWeight.w400, color: color87, height: 20.0 / 14.0),
caption = new TextStyle(fontSize: 12.0, fontWeight: FontWeight.w400, color: color54), caption = new TextStyle(fontSize: 12.0, fontWeight: FontWeight.w400, color: color54),
button = new TextStyle(fontSize: 14.0, fontWeight: FontWeight.w500, color: color87); button = new TextStyle(fontSize: 14.0, fontWeight: FontWeight.w500, color: color87);
...@@ -51,3 +51,15 @@ final TextTheme white = new TextTheme._( ...@@ -51,3 +51,15 @@ final TextTheme white = new TextTheme._(
// TODO(abarth): Maybe this should be hard-coded in Scaffold? // TODO(abarth): Maybe this should be hard-coded in Scaffold?
const String typeface = 'font-family: sans-serif'; const String typeface = 'font-family: sans-serif';
const TextStyle error = const TextStyle(
color: const Color(0xD0FF0000),
fontFamily: 'monospace',
fontSize: 48.0,
fontWeight: FontWeight.w900,
textAlign: TextAlign.right,
decoration: underline,
decorationColor: const Color(0xFFFF00),
decorationStyle: TextDecorationStyle.double
);
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
import '../theme/colors.dart'; import '../theme/colors.dart';
import '../theme/view_configuration.dart'; import '../theme/view_configuration.dart';
import 'basic.dart'; import 'basic.dart';
import 'default_text_style.dart';
import 'theme.dart';
class DrawerHeader extends Component { class DrawerHeader extends Component {
...@@ -30,7 +32,10 @@ class DrawerHeader extends Component { ...@@ -30,7 +32,10 @@ class DrawerHeader extends Component {
new Flexible(child: new Container()), new Flexible(child: new Container()),
new Container( new Container(
padding: const EdgeDims.symmetric(horizontal: 16.0), padding: const EdgeDims.symmetric(horizontal: 16.0),
child: new Flex(children, direction: FlexDirection.horizontal) child: new DefaultTextStyle(
style: Theme.of(this).text.body2,
child: new Flex(children, direction: FlexDirection.horizontal)
)
)], )],
direction: FlexDirection.vertical direction: FlexDirection.vertical
) )
......
...@@ -2,10 +2,13 @@ ...@@ -2,10 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import '../painting/text_style.dart';
import 'basic.dart'; import 'basic.dart';
import 'button_base.dart'; import 'button_base.dart';
import 'default_text_style.dart';
import 'icon.dart'; import 'icon.dart';
import 'ink_well.dart'; import 'ink_well.dart';
import 'theme.dart';
import 'widget.dart'; import 'widget.dart';
const BoxDecoration _kHighlightDecoration = const BoxDecoration( const BoxDecoration _kHighlightDecoration = const BoxDecoration(
...@@ -37,6 +40,13 @@ class MenuItem extends ButtonBase { ...@@ -37,6 +40,13 @@ class MenuItem extends ButtonBase {
super.syncFields(source); super.syncFields(source);
} }
TextStyle get textStyle {
TextStyle result = Theme.of(this).text.body2;
if (highlight)
result = result.copyWith(color: Theme.of(this).primary[500]);
return result;
}
Widget buildContent() { Widget buildContent() {
return new Listener( return new Listener(
onGestureTap: (_) { onGestureTap: (_) {
...@@ -53,10 +63,12 @@ class MenuItem extends ButtonBase { ...@@ -53,10 +63,12 @@ class MenuItem extends ButtonBase {
child: new Icon(type: "${icon}_grey600", size: 24) child: new Icon(type: "${icon}_grey600", size: 24)
), ),
new Flexible( new Flexible(
flex: 1,
child: new Padding( child: new Padding(
padding: const EdgeDims.symmetric(horizontal: 16.0), padding: const EdgeDims.symmetric(horizontal: 16.0),
child: new Flex(children, direction: FlexDirection.horizontal) child: new DefaultTextStyle(
style: textStyle,
child: new Flex(children, direction: FlexDirection.horizontal)
)
) )
) )
]) ])
......
...@@ -2,8 +2,11 @@ ...@@ -2,8 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import '../painting/text_style.dart';
import 'basic.dart'; import 'basic.dart';
import 'default_text_style.dart';
import 'ink_well.dart'; import 'ink_well.dart';
import 'theme.dart';
class PopupMenuItem extends Component { class PopupMenuItem extends Component {
PopupMenuItem({ String key, this.child, this.opacity}) : super(key: key); PopupMenuItem({ String key, this.child, this.opacity}) : super(key: key);
...@@ -11,6 +14,8 @@ class PopupMenuItem extends Component { ...@@ -11,6 +14,8 @@ class PopupMenuItem extends Component {
final Widget child; final Widget child;
final double opacity; final double opacity;
TextStyle get textStyle => Theme.of(this).text.subhead;
Widget build() { Widget build() {
return new Opacity( return new Opacity(
opacity: opacity, opacity: opacity,
...@@ -18,7 +23,10 @@ class PopupMenuItem extends Component { ...@@ -18,7 +23,10 @@ class PopupMenuItem extends Component {
child: new Container( child: new Container(
constraints: const BoxConstraints(minWidth: 112.0), constraints: const BoxConstraints(minWidth: 112.0),
padding: const EdgeDims.all(16.0), padding: const EdgeDims.all(16.0),
child: child child: new DefaultTextStyle(
style: textStyle,
child: child
)
) )
) )
); );
......
此差异已折叠。
...@@ -31,12 +31,12 @@ PAINT FOR FRAME #2 ---------------------------------------------- ...@@ -31,12 +31,12 @@ PAINT FOR FRAME #2 ----------------------------------------------
2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | | paintChild RenderImage at Point(16.0, 41.0) 2 | | | | | | | paintChild RenderImage at Point(16.0, 41.0)
2 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | paintChild RenderPadding at Point(48.0, 41.0) 2 | | | | | | paintChild RenderPadding at Point(48.0, 39.0)
2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | | paintChild RenderParagraph at Point(72.0, 41.0) 2 | | | | | | | paintChild RenderParagraph at Point(72.0, 39.0)
2 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | | | translate(72.0, 41.0) 2 | | | | | | | | translate(72.0, 39.0)
2 | | | | | | | | translate(-72.0, -41.0) 2 | | | | | | | | translate(-72.0, -39.0)
2 | | | | | | paintChild RenderPadding at Point(712.0, 33.0) 2 | | | | | | paintChild RenderPadding at Point(712.0, 33.0)
2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | | paintChild RenderImage at Point(720.0, 41.0) 2 | | | | | | | paintChild RenderImage at Point(720.0, 41.0)
...@@ -82,12 +82,12 @@ PAINT FOR FRAME #3 ---------------------------------------------- ...@@ -82,12 +82,12 @@ PAINT FOR FRAME #3 ----------------------------------------------
3 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 3 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
3 | | | | | | | paintChild RenderImage at Point(16.0, 41.0) 3 | | | | | | | paintChild RenderImage at Point(16.0, 41.0)
3 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 3 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
3 | | | | | | paintChild RenderPadding at Point(48.0, 41.0) 3 | | | | | | paintChild RenderPadding at Point(48.0, 39.0)
3 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 3 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
3 | | | | | | | paintChild RenderParagraph at Point(72.0, 41.0) 3 | | | | | | | paintChild RenderParagraph at Point(72.0, 39.0)
3 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 3 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
3 | | | | | | | | translate(72.0, 41.0) 3 | | | | | | | | translate(72.0, 39.0)
3 | | | | | | | | translate(-72.0, -41.0) 3 | | | | | | | | translate(-72.0, -39.0)
3 | | | | | | paintChild RenderPadding at Point(712.0, 33.0) 3 | | | | | | paintChild RenderPadding at Point(712.0, 33.0)
3 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 3 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
3 | | | | | | | paintChild RenderImage at Point(720.0, 41.0) 3 | | | | | | | paintChild RenderImage at Point(720.0, 41.0)
......
...@@ -108,11 +108,11 @@ PAINT FOR FRAME #2 ---------------------------------------------- ...@@ -108,11 +108,11 @@ PAINT FOR FRAME #2 ----------------------------------------------
2 | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | paintChild RenderConstrainedBox at Point(8.0, 25.0) 2 | | | | paintChild RenderConstrainedBox at Point(8.0, 25.0)
2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | paintChild RenderPadding at Point(8.0, 41.0) 2 | | | | | paintChild RenderPadding at Point(8.0, 39.0)
2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | paintChild RenderParagraph at Point(32.0, 41.0) 2 | | | | | | paintChild RenderParagraph at Point(32.0, 39.0)
2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | | translate(32.0, 41.0) 2 | | | | | | | translate(32.0, 39.0)
2 | | | | | | | translate(-32.0, -41.0) 2 | | | | | | | translate(-32.0, -39.0)
------------------------------------------------------------------------ ------------------------------------------------------------------------
PAINTED 2 FRAMES PAINTED 2 FRAMES
...@@ -18,49 +18,49 @@ PAINT FOR FRAME #2 ---------------------------------------------- ...@@ -18,49 +18,49 @@ PAINT FOR FRAME #2 ----------------------------------------------
2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | paintChild RenderOpacity at Point(104.83333333333334, 81.0) 2 | | | | | paintChild RenderOpacity at Point(104.83333333333334, 81.0)
2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | paintChild RenderPadding at Point(121.33333333333334, 93.0) 2 | | | | | | paintChild RenderPadding at Point(121.33333333333334, 91.0)
2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | | paintChild RenderImage at Point(121.33333333333334, 93.0) 2 | | | | | | | paintChild RenderImage at Point(121.33333333333334, 91.0)
2 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | paintChild RenderParagraph at Point(104.83333333333334, 127.0) 2 | | | | | | paintChild RenderParagraph at Point(104.83333333333334, 125.0)
2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | | translate(104.83333333333334, 127.0) 2 | | | | | | | translate(104.83333333333334, 125.0)
2 | | | | | | | translate(-104.83333333333334, -127.0) 2 | | | | | | | translate(-104.83333333333334, -125.0)
2 | | | | drawRect(Rect.fromLTRB(0.0, 153.0, 266.6666564941406, 155.0), Paint(color:Color(0xffff4081))) 2 | | | | drawRect(Rect.fromLTRB(0.0, 153.0, 266.6666564941406, 155.0), Paint(color:Color(0xffff4081)))
2 | | | | paintChild RenderInkWell at Point(266.6666666666667, 81.0) 2 | | | | paintChild RenderInkWell at Point(266.6666666666667, 81.0)
2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | paintChild RenderOpacity at Point(360.0, 81.0) 2 | | | | | paintChild RenderOpacity at Point(360.0, 81.0)
2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | saveLayer(null, Paint(color:Color(0xb3000000))) 2 | | | | | | saveLayer(null, Paint(color:Color(0xb3000000)))
2 | | | | | | paintChild RenderPadding at Point(388.0, 93.0) 2 | | | | | | paintChild RenderPadding at Point(388.0, 91.0)
2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | | paintChild RenderImage at Point(388.0, 93.0) 2 | | | | | | | paintChild RenderImage at Point(388.0, 91.0)
2 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | paintChild RenderParagraph at Point(360.0, 127.0) 2 | | | | | | paintChild RenderParagraph at Point(360.0, 125.0)
2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | | translate(360.0, 127.0) 2 | | | | | | | translate(360.0, 125.0)
2 | | | | | | | translate(-360.0, -127.0) 2 | | | | | | | translate(-360.0, -125.0)
2 | | | | | | restore 2 | | | | | | restore
2 | | | | paintChild RenderInkWell at Point(533.3333333333334, 81.0) 2 | | | | paintChild RenderInkWell at Point(533.3333333333334, 81.0)
2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | paintChild RenderOpacity at Point(630.6666666666667, 81.0) 2 | | | | | paintChild RenderOpacity at Point(630.6666666666667, 81.0)
2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | saveLayer(null, Paint(color:Color(0xb3000000))) 2 | | | | | | saveLayer(null, Paint(color:Color(0xb3000000)))
2 | | | | | | paintChild RenderPadding at Point(654.6666666666667, 93.0) 2 | | | | | | paintChild RenderPadding at Point(654.6666666666667, 91.0)
2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | | paintChild RenderImage at Point(654.6666666666667, 93.0) 2 | | | | | | | paintChild RenderImage at Point(654.6666666666667, 91.0)
2 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | paintChild RenderParagraph at Point(630.6666666666667, 127.0) 2 | | | | | | paintChild RenderParagraph at Point(630.6666666666667, 125.0)
2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | | translate(630.6666666666667, 127.0) 2 | | | | | | | translate(630.6666666666667, 125.0)
2 | | | | | | | translate(-630.6666666666667, -127.0) 2 | | | | | | | translate(-630.6666666666667, -125.0)
2 | | | | | | restore 2 | | | | | | restore
2 | | | paintChild RenderPositionedBox at Point(310.0, 155.0) 2 | | | paintChild RenderPositionedBox at Point(310.0, 155.0)
2 | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | paintChild RenderParagraph at Point(310.0, 349.5) 2 | | | | paintChild RenderParagraph at Point(310.0, 343.5)
2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | translate(310.0, 349.5) 2 | | | | | translate(310.0, 343.5)
2 | | | | | translate(-310.0, -349.5) 2 | | | | | translate(-310.0, -343.5)
2 | | paintChild RenderDecoratedBox at Point(0.0, 0.0) 2 | | paintChild RenderDecoratedBox at Point(0.0, 0.0)
2 | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | drawRect(Rect.fromLTRB(0.0, 0.0, 800.0, 81.0), Paint(color:Color(0xff3f51b5), drawLooper:true)) 2 | | | drawRect(Rect.fromLTRB(0.0, 0.0, 800.0, 81.0), Paint(color:Color(0xff3f51b5), drawLooper:true))
...@@ -68,11 +68,11 @@ PAINT FOR FRAME #2 ---------------------------------------------- ...@@ -68,11 +68,11 @@ PAINT FOR FRAME #2 ----------------------------------------------
2 | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | paintChild RenderConstrainedBox at Point(8.0, 25.0) 2 | | | | paintChild RenderConstrainedBox at Point(8.0, 25.0)
2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | paintChild RenderPadding at Point(8.0, 41.0) 2 | | | | | paintChild RenderPadding at Point(8.0, 39.0)
2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | paintChild RenderParagraph at Point(32.0, 41.0) 2 | | | | | | paintChild RenderParagraph at Point(32.0, 39.0)
2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | | translate(32.0, 41.0) 2 | | | | | | | translate(32.0, 39.0)
2 | | | | | | | translate(-32.0, -41.0) 2 | | | | | | | translate(-32.0, -39.0)
------------------------------------------------------------------------ ------------------------------------------------------------------------
PAINTED 2 FRAMES PAINTED 2 FRAMES
...@@ -15,10 +15,10 @@ PAINT FOR FRAME #2 ---------------------------------------------- ...@@ -15,10 +15,10 @@ PAINT FOR FRAME #2 ----------------------------------------------
2 | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffe0e0e0), drawLooper:true)) 2 | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffe0e0e0), drawLooper:true))
2 | | | | paintChild RenderPositionedBox at Point(364.0, 282.0) 2 | | | | paintChild RenderPositionedBox at Point(364.0, 282.0)
2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | paintChild RenderParagraph at Point(370.0, 292.0) 2 | | | | | paintChild RenderParagraph at Point(370.0, 290.0)
2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | translate(370.0, 292.0) 2 | | | | | | translate(370.0, 290.0)
2 | | | | | | translate(-370.0, -292.0) 2 | | | | | | translate(-370.0, -290.0)
------------------------------------------------------------------------ ------------------------------------------------------------------------
CONSOLE: CONSOLE:
PAINT FOR FRAME #3 ---------------------------------------------- PAINT FOR FRAME #3 ----------------------------------------------
...@@ -32,10 +32,10 @@ PAINT FOR FRAME #3 ---------------------------------------------- ...@@ -32,10 +32,10 @@ PAINT FOR FRAME #3 ----------------------------------------------
3 | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0x00000000))) 3 | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0x00000000)))
3 | | | | paintChild RenderPositionedBox at Point(364.0, 282.0) 3 | | | | paintChild RenderPositionedBox at Point(364.0, 282.0)
3 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 3 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
3 | | | | | paintChild RenderParagraph at Point(370.0, 292.0) 3 | | | | | paintChild RenderParagraph at Point(370.0, 290.0)
3 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 3 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
3 | | | | | | translate(370.0, 292.0) 3 | | | | | | translate(370.0, 290.0)
3 | | | | | | translate(-370.0, -292.0) 3 | | | | | | translate(-370.0, -290.0)
------------------------------------------------------------------------ ------------------------------------------------------------------------
CONSOLE: CONSOLE:
PAINT FOR FRAME #4 ---------------------------------------------- PAINT FOR FRAME #4 ----------------------------------------------
...@@ -47,10 +47,10 @@ PAINT FOR FRAME #4 ---------------------------------------------- ...@@ -47,10 +47,10 @@ PAINT FOR FRAME #4 ----------------------------------------------
4 | | | drawCircle(Point(400.0, 300.0), 28.0, Paint(color:Color(0xffff4081), drawLooper:true)) 4 | | | drawCircle(Point(400.0, 300.0), 28.0, Paint(color:Color(0xffff4081), drawLooper:true))
4 | | | saveLayer(Rect.fromLTRB(372.0, 272.0, 428.0, 328.0), Paint(color:Color(0xff000000))) 4 | | | saveLayer(Rect.fromLTRB(372.0, 272.0, 428.0, 328.0), Paint(color:Color(0xff000000)))
4 | | | clipPath(Instance of 'Path') 4 | | | clipPath(Instance of 'Path')
4 | | | paintChild RenderParagraph at Point(394.0, 292.0) 4 | | | paintChild RenderParagraph at Point(394.0, 290.0)
4 | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 4 | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
4 | | | | translate(394.0, 292.0) 4 | | | | translate(394.0, 290.0)
4 | | | | translate(-394.0, -292.0) 4 | | | | translate(-394.0, -290.0)
4 | | | restore 4 | | | restore
------------------------------------------------------------------------ ------------------------------------------------------------------------
PAINTED 4 FRAMES PAINTED 4 FRAMES
...@@ -13,28 +13,28 @@ PAINT FOR FRAME #2 ---------------------------------------------- ...@@ -13,28 +13,28 @@ PAINT FOR FRAME #2 ----------------------------------------------
2 | | | drawRect(Rect.fromLTRB(0.0, 0.0, 800.0, 600.0), Paint(color:Color(0x7f000000))) 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 | | paintChild RenderPositionedBox at Point(0.0, 0.0)
2 | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | paintChild RenderPadding at Point(220.0, 212.5) 2 | | | paintChild RenderPadding at Point(220.0, 206.0)
2 | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | paintChild RenderConstrainedBox at Point(260.0, 236.5) 2 | | | | paintChild RenderConstrainedBox at Point(260.0, 230.0)
2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffffffff), drawLooper:true)) 2 | | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffffffff), drawLooper:true))
2 | | | | | paintChild RenderPadding at Point(260.0, 236.5) 2 | | | | | paintChild RenderPadding at Point(260.0, 230.0)
2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | paintChild RenderParagraph at Point(284.0, 260.5) 2 | | | | | | paintChild RenderParagraph at Point(284.0, 254.0)
2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | | translate(284.0, 260.5) 2 | | | | | | | translate(284.0, 254.0)
2 | | | | | | | translate(-284.0, -260.5) 2 | | | | | | | translate(-284.0, -254.0)
2 | | | | | paintChild RenderPadding at Point(260.0, 284.5) 2 | | | | | paintChild RenderPadding at Point(260.0, 282.0)
2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | paintChild RenderParagraph at Point(284.0, 304.5) 2 | | | | | | paintChild RenderParagraph at Point(284.0, 302.0)
2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | | translate(284.0, 304.5) 2 | | | | | | | translate(284.0, 302.0)
2 | | | | | | | translate(-284.0, -304.5) 2 | | | | | | | translate(-284.0, -302.0)
2 | | | | | paintChild RenderFlex at Point(260.0, 347.5) 2 | | | | | paintChild RenderFlex at Point(260.0, 350.0)
2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | paintChild RenderParagraph at Point(411.0, 347.5) 2 | | | | | | paintChild RenderParagraph at Point(411.0, 350.0)
2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | | translate(411.0, 347.5) 2 | | | | | | | translate(411.0, 350.0)
2 | | | | | | | translate(-411.0, -347.5) 2 | | | | | | | translate(-411.0, -350.0)
------------------------------------------------------------------------ ------------------------------------------------------------------------
PAINTED 2 FRAMES PAINTED 2 FRAMES
...@@ -20,10 +20,10 @@ PAINT FOR FRAME #2 ---------------------------------------------- ...@@ -20,10 +20,10 @@ PAINT FOR FRAME #2 ----------------------------------------------
2 | | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffe0e0e0), drawLooper:true)) 2 | | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffe0e0e0), drawLooper:true))
2 | | | | | paintChild RenderPositionedBox at Point(441.0, 107.0) 2 | | | | | paintChild RenderPositionedBox at Point(441.0, 107.0)
2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | paintChild RenderParagraph at Point(441.0, 117.0) 2 | | | | | | paintChild RenderParagraph at Point(441.0, 115.0)
2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | | translate(441.0, 117.0) 2 | | | | | | | translate(441.0, 115.0)
2 | | | | | | | translate(-441.0, -117.0) 2 | | | | | | | translate(-441.0, -115.0)
2 | | paintChild RenderConstrainedBox at Point(0.0, 250.0) 2 | | paintChild RenderConstrainedBox at Point(0.0, 250.0)
2 | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | paintChild RenderDecoratedBox at Point(0.0, 250.0) 2 | | | paintChild RenderDecoratedBox at Point(0.0, 250.0)
...@@ -36,10 +36,10 @@ PAINT FOR FRAME #2 ---------------------------------------------- ...@@ -36,10 +36,10 @@ PAINT FOR FRAME #2 ----------------------------------------------
2 | | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffe0e0e0), drawLooper:true)) 2 | | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffe0e0e0), drawLooper:true))
2 | | | | | paintChild RenderPositionedBox at Point(16.0, 258.0) 2 | | | | | paintChild RenderPositionedBox at Point(16.0, 258.0)
2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | paintChild RenderParagraph at Point(228.5, 367.0) 2 | | | | | | paintChild RenderParagraph at Point(228.5, 365.0)
2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 2 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
2 | | | | | | | translate(228.5, 367.0) 2 | | | | | | | translate(228.5, 365.0)
2 | | | | | | | translate(-228.5, -367.0) 2 | | | | | | | translate(-228.5, -365.0)
------------------------------------------------------------------------ ------------------------------------------------------------------------
CONSOLE: CONSOLE:
PAINT FOR FRAME #3 ---------------------------------------------- PAINT FOR FRAME #3 ----------------------------------------------
...@@ -58,10 +58,10 @@ PAINT FOR FRAME #3 ---------------------------------------------- ...@@ -58,10 +58,10 @@ PAINT FOR FRAME #3 ----------------------------------------------
3 | | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffe0e0e0), drawLooper:true)) 3 | | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffe0e0e0), drawLooper:true))
3 | | | | | paintChild RenderPositionedBox at Point(565.0, 107.0) 3 | | | | | paintChild RenderPositionedBox at Point(565.0, 107.0)
3 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 3 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
3 | | | | | | paintChild RenderParagraph at Point(565.0, 117.0) 3 | | | | | | paintChild RenderParagraph at Point(565.0, 115.0)
3 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 3 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
3 | | | | | | | translate(565.0, 117.0) 3 | | | | | | | translate(565.0, 115.0)
3 | | | | | | | translate(-565.0, -117.0) 3 | | | | | | | translate(-565.0, -115.0)
3 | | paintChild RenderConstrainedBox at Point(0.0, 250.0) 3 | | paintChild RenderConstrainedBox at Point(0.0, 250.0)
3 | | | TestPaintingCanvas() constructor: 800.0 x 600.0 3 | | | TestPaintingCanvas() constructor: 800.0 x 600.0
3 | | | paintChild RenderDecoratedBox at Point(0.0, 250.0) 3 | | | paintChild RenderDecoratedBox at Point(0.0, 250.0)
...@@ -74,10 +74,10 @@ PAINT FOR FRAME #3 ---------------------------------------------- ...@@ -74,10 +74,10 @@ PAINT FOR FRAME #3 ----------------------------------------------
3 | | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffe0e0e0), drawLooper:true)) 3 | | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffe0e0e0), drawLooper:true))
3 | | | | | paintChild RenderPositionedBox at Point(16.0, 258.0) 3 | | | | | paintChild RenderPositionedBox at Point(16.0, 258.0)
3 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 3 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
3 | | | | | | paintChild RenderParagraph at Point(290.5, 367.0) 3 | | | | | | paintChild RenderParagraph at Point(290.5, 365.0)
3 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 3 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
3 | | | | | | | translate(290.5, 367.0) 3 | | | | | | | translate(290.5, 365.0)
3 | | | | | | | translate(-290.5, -367.0) 3 | | | | | | | translate(-290.5, -365.0)
------------------------------------------------------------------------ ------------------------------------------------------------------------
CONSOLE: CONSOLE:
PAINT FOR FRAME #4 ---------------------------------------------- PAINT FOR FRAME #4 ----------------------------------------------
...@@ -96,10 +96,10 @@ PAINT FOR FRAME #4 ---------------------------------------------- ...@@ -96,10 +96,10 @@ PAINT FOR FRAME #4 ----------------------------------------------
4 | | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffe0e0e0), drawLooper:true)) 4 | | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffe0e0e0), drawLooper:true))
4 | | | | | paintChild RenderPositionedBox at Point(441.0, 107.0) 4 | | | | | paintChild RenderPositionedBox at Point(441.0, 107.0)
4 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 4 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
4 | | | | | | paintChild RenderParagraph at Point(441.0, 117.0) 4 | | | | | | paintChild RenderParagraph at Point(441.0, 115.0)
4 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 4 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
4 | | | | | | | translate(441.0, 117.0) 4 | | | | | | | translate(441.0, 115.0)
4 | | | | | | | translate(-441.0, -117.0) 4 | | | | | | | translate(-441.0, -115.0)
4 | | paintChild RenderConstrainedBox at Point(0.0, 250.0) 4 | | paintChild RenderConstrainedBox at Point(0.0, 250.0)
4 | | | TestPaintingCanvas() constructor: 800.0 x 600.0 4 | | | TestPaintingCanvas() constructor: 800.0 x 600.0
4 | | | paintChild RenderDecoratedBox at Point(0.0, 250.0) 4 | | | paintChild RenderDecoratedBox at Point(0.0, 250.0)
...@@ -112,9 +112,9 @@ PAINT FOR FRAME #4 ---------------------------------------------- ...@@ -112,9 +112,9 @@ PAINT FOR FRAME #4 ----------------------------------------------
4 | | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffe0e0e0), drawLooper:true)) 4 | | | | | drawRRect(Instance of 'RRect', Paint(color:Color(0xffe0e0e0), drawLooper:true))
4 | | | | | paintChild RenderPositionedBox at Point(16.0, 258.0) 4 | | | | | paintChild RenderPositionedBox at Point(16.0, 258.0)
4 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 4 | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
4 | | | | | | paintChild RenderParagraph at Point(228.5, 367.0) 4 | | | | | | paintChild RenderParagraph at Point(228.5, 365.0)
4 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0 4 | | | | | | | TestPaintingCanvas() constructor: 800.0 x 600.0
4 | | | | | | | translate(228.5, 367.0) 4 | | | | | | | translate(228.5, 365.0)
4 | | | | | | | translate(-228.5, -367.0) 4 | | | | | | | translate(-228.5, -365.0)
------------------------------------------------------------------------ ------------------------------------------------------------------------
PAINTED 4 FRAMES PAINTED 4 FRAMES
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册