Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: sky/sdk/example/widgets/spinning_mixed.dart

Issue 1212943007: Fix spinning_mixed.dart, and resulting yak shave. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | sky/sdk/lib/rendering/box.dart » ('j') | sky/sdk/lib/rendering/box.dart » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 import 'dart:sky' as sky; 5 import 'dart:sky' as sky;
6 6
7 import 'package:sky/base/scheduler.dart'; 7 import 'package:sky/base/scheduler.dart' as scheduler;
8 import 'package:sky/rendering/box.dart'; 8 import 'package:sky/rendering/box.dart';
9 import 'package:sky/rendering/flex.dart'; 9 import 'package:sky/rendering/flex.dart';
10 import 'package:sky/rendering/sky_binding.dart'; 10 import 'package:sky/rendering/sky_binding.dart';
11 import 'package:sky/widgets/basic.dart'; 11 import 'package:sky/widgets/basic.dart';
12 import 'package:sky/widgets/raised_button.dart'; 12 import 'package:sky/widgets/raised_button.dart';
13 import 'package:sky/widgets/widget.dart'; 13 import 'package:sky/widgets/widget.dart';
14 import 'package:vector_math/vector_math.dart'; 14 import 'package:vector_math/vector_math.dart';
15 15
16 import '../rendering/solid_color_box.dart'; 16 import '../rendering/solid_color_box.dart';
17 17
(...skipping 19 matching lines...) Expand all
37 37
38 Widget builder() { 38 Widget builder() {
39 return new Flex([ 39 return new Flex([
40 new Rectangle(const Color(0xFF00FFFF)), 40 new Rectangle(const Color(0xFF00FFFF)),
41 new Container( 41 new Container(
42 padding: new EdgeDims.all(10.0), 42 padding: new EdgeDims.all(10.0),
43 margin: new EdgeDims.all(10.0), 43 margin: new EdgeDims.all(10.0),
44 decoration: new BoxDecoration(backgroundColor: const Color(0xFFCCCCCC)), 44 decoration: new BoxDecoration(backgroundColor: const Color(0xFFCCCCCC)),
45 child: new RaisedButton( 45 child: new RaisedButton(
46 child: new Flex([ 46 child: new Flex([
47 new Image(src: "https://www.dartlang.org/logos/dart-logo.png"), 47 new NetworkImage(src: "https://www.dartlang.org/logos/dart-logo.png" ),
48 new Text('PRESS ME'), 48 new Text('PRESS ME'),
49 ]), 49 ]),
50 onPressed: () => print("Hello World") 50 onPressed: () => print("Hello World")
51 ) 51 )
52 ), 52 ),
53 new Rectangle(const Color(0xFFFFFF00)), 53 new Rectangle(const Color(0xFFFFFF00)),
54 ], 54 ],
55 direction: FlexDirection.vertical, 55 direction: FlexDirection.vertical,
56 justifyContent: FlexJustifyContent.spaceBetween 56 justifyContent: FlexJustifyContent.spaceBetween
57 ); 57 );
(...skipping 28 matching lines...) Expand all
86 new RenderBoxToWidgetAdapter(proxy, builder); // adds itself to proxy 86 new RenderBoxToWidgetAdapter(proxy, builder); // adds itself to proxy
87 87
88 addFlexChildSolidColor(flexRoot, const sky.Color(0xFFFF00FF), flex: 1); 88 addFlexChildSolidColor(flexRoot, const sky.Color(0xFFFF00FF), flex: 1);
89 flexRoot.add(proxy); 89 flexRoot.add(proxy);
90 addFlexChildSolidColor(flexRoot, const sky.Color(0xFF0000FF), flex: 1); 90 addFlexChildSolidColor(flexRoot, const sky.Color(0xFF0000FF), flex: 1);
91 91
92 transformBox = new RenderTransform(child: flexRoot, transform: new Matrix4.ide ntity()); 92 transformBox = new RenderTransform(child: flexRoot, transform: new Matrix4.ide ntity());
93 RenderPadding root = new RenderPadding(padding: new EdgeDims.all(80.0), child: transformBox); 93 RenderPadding root = new RenderPadding(padding: new EdgeDims.all(80.0), child: transformBox);
94 94
95 SkyBinding.instance.root = root; 95 SkyBinding.instance.root = root;
96 addPersistentFrameCallback(rotate); 96 scheduler.addPersistentFrameCallback(rotate);
97 } 97 }
OLDNEW
« no previous file with comments | « no previous file | sky/sdk/lib/rendering/box.dart » ('j') | sky/sdk/lib/rendering/box.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698