Merge pull request #662 from chinmaygarde/master
Fix issue caught by Chrome Clang plugin
diff --git a/examples/game/lib/main.dart b/examples/game/lib/main.dart
index bc78445..d18fe06 100644
--- a/examples/game/lib/main.dart
+++ b/examples/game/lib/main.dart
@@ -48,8 +48,8 @@
_app = new GameDemoApp();
- _sounds["explosion"] = new SoundEffect('https://github.com/slembcke/GalacticGuardian.spritebuilder/raw/GDC/Packages/SpriteBuilder%20Resources.sbpack/TempSounds/Explosion.wav');
- _sounds["laser"] = new SoundEffect('https://github.com/slembcke/GalacticGuardian.spritebuilder/raw/GDC/Packages/SpriteBuilder%20Resources.sbpack/TempSounds/Laser.wav');
+ _sounds["explosion"] = new SoundEffect(_bundle.load('assets/explosion.wav'));
+ _sounds["laser"] = new SoundEffect(_bundle.load('assets/laser.wav'));
await _sounds["explosion"].load();
await _sounds["laser"].load();
diff --git a/examples/game/lib/sound.dart b/examples/game/lib/sound.dart
index 5e50e7f..b217090 100644
--- a/examples/game/lib/sound.dart
+++ b/examples/game/lib/sound.dart
@@ -6,16 +6,15 @@
typedef void SoundEffectStreamCallback(SoundEffectStream);
class SoundEffect {
- SoundEffect(this._url);
+ SoundEffect(this._pipeFuture);
// TODO: Remove load method from SoundEffect
Future load() async {
- UrlResponse response = await fetchUrl(_url);
- _data = response.body;
+ _data = await _pipeFuture;
}
- String _url;
- Object _data;
+ Future<MojoDataPipeConsumer> _pipeFuture;
+ MojoDataPipeConsumer _data;
}
class SoundEffectStream {
diff --git a/examples/game/lib/sound_manager.dart b/examples/game/lib/sound_manager.dart
index 90c03a9..311da05 100644
--- a/examples/game/lib/sound_manager.dart
+++ b/examples/game/lib/sound_manager.dart
@@ -54,7 +54,6 @@
static void purgeSharedInstance() {
if (_sharedSoundManager == null) return;
- _sharedSoundManager._running = false;
_sharedSoundManager = null;
}
@@ -72,7 +71,6 @@
bool enableBackgroundMusic;
bool enableSoundEffects;
- bool _running = true;
int _lastTimeStamp;
void playEvent(SoundEvent evt, [double volume = 1.0, double pitch = 1.0, double pan = 0.0]) {
diff --git a/examples/game/lib/sprite_widget.dart b/examples/game/lib/sprite_widget.dart
index 9f58a02..7ddb51e 100644
--- a/examples/game/lib/sprite_widget.dart
+++ b/examples/game/lib/sprite_widget.dart
@@ -24,14 +24,14 @@
/// var mySpriteWidget = new SpriteWidget(mySpriteTree, SpriteBoxTransformMode.fixedHeight);
SpriteWidget(this.rootNode, [this.transformMode = SpriteBoxTransformMode.letterbox]);
- SpriteBox get root => super.root;
+ SpriteBox get renderObject => super.renderObject;
SpriteBox createNode() => new SpriteBox(rootNode, transformMode);
void syncRenderObject(SpriteWidget old) {
super.syncRenderObject(old);
- root.rootNode = rootNode;
- root.transformMode = transformMode;
+ renderObject.rootNode = rootNode;
+ renderObject.transformMode = transformMode;
}
}
diff --git a/examples/game/lib/sprites.dart b/examples/game/lib/sprites.dart
index 6522290..8735554 100644
--- a/examples/game/lib/sprites.dart
+++ b/examples/game/lib/sprites.dart
@@ -10,6 +10,7 @@
import 'dart:typed_data';
import 'dart:sky';
+import 'package:mojo/core.dart';
import 'package:mojo/mojo/url_response.mojom.dart';
import 'package:sky/animation/curves.dart';
import 'package:sky/base/scheduler.dart' as scheduler;
diff --git a/examples/raw/hello_world.dart b/examples/raw/hello_world.dart
index c9ed52a..ee4669c 100644
--- a/examples/raw/hello_world.dart
+++ b/examples/raw/hello_world.dart
@@ -8,7 +8,7 @@
Size size = new Size(view.width, view.height);
PictureRecorder recorder = new PictureRecorder();
- final double devicePixelRatio = sky.view.devicePixelRatio;
+ final double devicePixelRatio = view.devicePixelRatio;
Canvas canvas = new Canvas(recorder, Point.origin & (size * devicePixelRatio));
canvas.scale(devicePixelRatio, devicePixelRatio);
double radius = size.shortestSide * 0.45;
diff --git a/examples/raw/painting_node.dart b/examples/raw/painting_node.dart
index 2a7e67f..3cfa950 100644
--- a/examples/raw/painting_node.dart
+++ b/examples/raw/painting_node.dart
@@ -21,7 +21,7 @@
paintingNode = new PaintingNode();
Paint innerPaint = new Paint()..color = new Color.fromARGB(a, 255 - r, 255 - g, 255 - b);
PictureRecorder innerRecorder = new PictureRecorder();
- Canvas innerCanvas = new Canvas(innerRecorder, Point.origin & bounds);
+ Canvas innerCanvas = new Canvas(innerRecorder, Point.origin & size);
innerCanvas.drawCircle(size.center(Point.origin), radius * 0.5, innerPaint);
paintingNode.setBackingDrawable(innerRecorder.endRecordingAsDrawable());
diff --git a/examples/raw/shadow.dart b/examples/raw/shadow.dart
index 2907a3c..c301beb 100644
--- a/examples/raw/shadow.dart
+++ b/examples/raw/shadow.dart
@@ -21,11 +21,11 @@
..setPaintBits(PaintBits.all)
..setOffset(const Offset(5.0, 5.0))
..setColorMode(TransferMode.src),
- (Paint layerPaint) {
- layerPaint.color = const Color.fromARGB(128, 55, 55, 55);
- layerPaint.setMaskFilter(
- new MaskFilter.blur(BlurStyle.normal, 5.0, highQuality: true));
- })
+ new Paint()
+ ..color = const Color.fromARGB(128, 55, 55, 55)
+ ..setMaskFilter(
+ new MaskFilter.blur(BlurStyle.normal, 5.0, highQuality: true))
+ )
// Main layer.
..addLayerOnTop(new DrawLooperLayerInfo(), new Paint());
paint.setDrawLooper(builder.build());
diff --git a/examples/raw/spinning_image.dart b/examples/raw/spinning_image.dart
index 8e5267b..d4a2239 100644
--- a/examples/raw/spinning_image.dart
+++ b/examples/raw/spinning_image.dart
@@ -20,7 +20,7 @@
PictureRecorder recorder = new PictureRecorder();
final double devicePixelRatio = view.devicePixelRatio;
Canvas canvas = new Canvas(recorder, Point.origin & new Size(view.width * devicePixelRatio, view.height * devicePixelRatio));
- cavnas.scale(devicePixelRatio, devicePixelRatio);
+ canvas.scale(devicePixelRatio, devicePixelRatio);
canvas.translate(view.width / 2.0, view.height / 2.0);
canvas.rotate(math.PI * delta / 1800);
canvas.scale(0.2, 0.2);
@@ -61,7 +61,7 @@
}
if (event.type == "pointerup") {
- image_cache.load(url2).then(handleImageLoad);
+ image_cache.load(url2).first.then(handleImageLoad);
return true;
}
@@ -69,7 +69,7 @@
}
void main() {
- image_cache.load(url1).then(handleImageLoad);
+ image_cache.load(url1).first.then(handleImageLoad);
view.setEventCallback(handleEvent);
view.setFrameCallback(beginFrame);
}
diff --git a/examples/rendering/align_items.dart b/examples/rendering/align_items.dart
index c8f6b24..817857d 100644
--- a/examples/rendering/align_items.dart
+++ b/examples/rendering/align_items.dart
@@ -18,25 +18,25 @@
for(FlexAlignItems alignItems in FlexAlignItems.values) {
TextStyle style = const TextStyle(color: const Color(0xFF000000));
- RenderParagraph paragraph = new RenderParagraph(new RenderStyled(style, [new RenderText("${alignItems}")]));
+ RenderParagraph paragraph = new RenderParagraph(new StyledTextSpan(style, [new PlainTextSpan("${alignItems}")]));
table.add(new RenderPadding(child: paragraph, padding: new EdgeDims.only(top: 20.0)));
var row = new RenderFlex(alignItems: alignItems, textBaseline: TextBaseline.alphabetic);
style = new TextStyle(fontSize: 15.0, color: const Color(0xFF000000));
row.add(new RenderDecoratedBox(
decoration: new BoxDecoration(backgroundColor: const Color(0x7FFFCCCC)),
- child: new RenderParagraph(new RenderStyled(style, [new RenderText('foo foo foo')]))
+ child: new RenderParagraph(new StyledTextSpan(style, [new PlainTextSpan('foo foo foo')]))
));
style = new TextStyle(fontSize: 10.0, color: const Color(0xFF000000));
row.add(new RenderDecoratedBox(
decoration: new BoxDecoration(backgroundColor: const Color(0x7FCCFFCC)),
- child: new RenderParagraph(new RenderStyled(style, [new RenderText('foo foo foo')]))
+ child: new RenderParagraph(new StyledTextSpan(style, [new PlainTextSpan('foo foo foo')]))
));
var subrow = new RenderFlex(alignItems: alignItems, textBaseline: TextBaseline.alphabetic);
style = new TextStyle(fontSize: 25.0, color: const Color(0xFF000000));
subrow.add(new RenderDecoratedBox(
decoration: new BoxDecoration(backgroundColor: const Color(0x7FCCCCFF)),
- child: new RenderParagraph(new RenderStyled(style, [new RenderText('foo foo foo foo')]))
+ child: new RenderParagraph(new StyledTextSpan(style, [new PlainTextSpan('foo foo foo foo')]))
));
subrow.add(new RenderSolidColorBox(const Color(0x7FCCFFFF), desiredSize: new Size(30.0, 40.0)));
row.add(subrow);
diff --git a/examples/rendering/baseline.dart b/examples/rendering/baseline.dart
index 527d9cd..3d61016 100644
--- a/examples/rendering/baseline.dart
+++ b/examples/rendering/baseline.dart
@@ -13,19 +13,19 @@
RenderBox getBox(double lh) {
RenderParagraph paragraph = new RenderParagraph(
- new RenderStyled(
+ new StyledTextSpan(
new TextStyle(
color: const Color(0xFF0000A0)
),
[
- new RenderText('test'),
- new RenderStyled(
+ new PlainTextSpan('test'),
+ new StyledTextSpan(
new TextStyle(
fontFamily: 'serif',
fontSize: 50.0,
height: lh
),
- [new RenderText('مرحبا Hello')]
+ [new PlainTextSpan('مرحبا Hello')]
)
]
)
diff --git a/examples/rendering/interactive_flex.dart b/examples/rendering/interactive_flex.dart
index 2f1b97c..462ea0b 100644
--- a/examples/rendering/interactive_flex.dart
+++ b/examples/rendering/interactive_flex.dart
@@ -65,7 +65,7 @@
// Resizeable image
image = new RenderImageGrow(null, new Size(100.0, null));
- image_cache.load("https://www.dartlang.org/logos/dart-logo.png").then((Image dartLogo) {
+ image_cache.load("https://www.dartlang.org/logos/dart-logo.png").first.then((Image dartLogo) {
image.image = dartLogo;
});
@@ -84,9 +84,9 @@
andouille leberkas capicola meatloaf. Chicken pig ball tip pork picanha bresaola
alcatra. Pork pork belly alcatra, flank chuck drumstick biltong doner jowl.
Pancetta meatball tongue tenderloin rump tail jowl boudin.""";
- var text = new RenderStyled(
+ var text = new StyledTextSpan(
new TextStyle(color: const Color(0xFF009900)),
- [new RenderText(meatyString)]);
+ [new PlainTextSpan(meatyString)]);
padding = new RenderPadding(
padding: const EdgeDims.all(10.0),
child: new RenderParagraph(text));
diff --git a/examples/rendering/justify_content.dart b/examples/rendering/justify_content.dart
index 13e01d0..df3e186 100644
--- a/examples/rendering/justify_content.dart
+++ b/examples/rendering/justify_content.dart
@@ -21,7 +21,7 @@
var table = new RenderFlex(direction: FlexDirection.vertical);
void addRow(FlexJustifyContent justify) {
- RenderParagraph paragraph = new RenderParagraph(new RenderStyled(style, [new RenderText("${justify}")]));
+ RenderParagraph paragraph = new RenderParagraph(new StyledTextSpan(style, [new PlainTextSpan("${justify}")]));
table.add(new RenderPadding(child: paragraph, padding: new EdgeDims.only(top: 20.0)));
var row = new RenderFlex(direction: FlexDirection.horizontal);
row.add(new RenderSolidColorBox(const Color(0xFFFFCCCC), desiredSize: new Size(80.0, 60.0)));
diff --git a/examples/rendering/render_paragraph.dart b/examples/rendering/render_paragraph.dart
index 3227e90..58e390b 100644
--- a/examples/rendering/render_paragraph.dart
+++ b/examples/rendering/render_paragraph.dart
@@ -32,9 +32,9 @@
alcatra. Pork pork belly alcatra, flank chuck drumstick biltong doner jowl.
Pancetta meatball tongue tenderloin rump tail jowl boudin.""";
- var text = new RenderStyled(
+ var text = new StyledTextSpan(
new TextStyle(color: const Color(0xFF009900)),
- [new RenderText(meatyString)]);
+ [new PlainTextSpan(meatyString)]);
child = new RenderDecoratedBox(
decoration: new BoxDecoration(backgroundColor: const Color(0xFFFFFFFF)),
child: new RenderParagraph(text)
diff --git a/examples/rendering/touch_demo.dart b/examples/rendering/touch_demo.dart
index d94333b..33d745f 100644
--- a/examples/rendering/touch_demo.dart
+++ b/examples/rendering/touch_demo.dart
@@ -76,12 +76,12 @@
..color = const Color(0xFFFFFFFF);
canvas.drawRect(offset & size, white);
for (Dot dot in dots.values)
- dot.paint(canvas, offset);
+ dot.paint(context, offset);
}
}
void main() {
- var paragraph = new RenderParagraph(new RenderText("Touch me!"));
+ var paragraph = new RenderParagraph(new PlainTextSpan("Touch me!"));
var stack = new RenderStack(children: [
new RenderTouchDemo(),
paragraph,
diff --git a/examples/widgets/drag_and_drop.dart b/examples/widgets/drag_and_drop.dart
new file mode 100644
index 0000000..7c2f00f
--- /dev/null
+++ b/examples/widgets/drag_and_drop.dart
@@ -0,0 +1,151 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:sky' as sky;
+
+import 'package:sky/theme/colors.dart' as colors;
+import 'package:sky/widgets.dart';
+
+final double kTop = 10.0 + sky.view.paddingTop;
+final double kLeft = 10.0;
+
+class DragData {
+ DragData(this.text);
+
+ final String text;
+}
+
+class ExampleDragTarget extends StatefulComponent {
+ String _text = 'ready';
+
+ void syncFields(ExampleDragTarget source) {
+ }
+
+ void _handleAccept(DragData data) {
+ setState(() {
+ _text = data.text;
+ });
+ }
+
+ Widget build() {
+ return new DragTarget<DragData>(
+ onAccept: _handleAccept,
+ builder: (List<DragData> data, _) {
+ return new Container(
+ width: 100.0,
+ height: 100.0,
+ margin: new EdgeDims.all(10.0),
+ decoration: new BoxDecoration(
+ border: new Border.all(
+ width: 3.0,
+ color: data.isEmpty ? colors.white : colors.Blue[500]
+ ),
+ backgroundColor: data.isEmpty ? colors.Grey[500] : colors.Green[500]
+ ),
+ child: new Center(
+ child: new Text(_text)
+ )
+ );
+ }
+ );
+ }
+}
+
+class Dot extends Component {
+ Widget build() {
+ return new Container(
+ width: 50.0,
+ height: 50.0,
+ decoration: new BoxDecoration(
+ backgroundColor: colors.DeepOrange[500]
+ )
+ );
+ }
+}
+
+class DragAndDropApp extends App {
+ DragController _dragController;
+ Offset _displacement = Offset.zero;
+
+ EventDisposition _startDrag(sky.PointerEvent event) {
+ setState(() {
+ _dragController = new DragController(new DragData("Orange"));
+ _dragController.update(new Point(event.x, event.y));
+ _displacement = Offset.zero;
+ });
+ return EventDisposition.consumed;
+ }
+
+ EventDisposition _updateDrag(sky.PointerEvent event) {
+ setState(() {
+ _dragController.update(new Point(event.x, event.y));
+ _displacement += new Offset(event.dx, event.dy);
+ });
+ return EventDisposition.consumed;
+ }
+
+ EventDisposition _cancelDrag(sky.PointerEvent event) {
+ setState(() {
+ _dragController.cancel();
+ _dragController = null;
+ });
+ return EventDisposition.consumed;
+ }
+
+ EventDisposition _drop(sky.PointerEvent event) {
+ setState(() {
+ _dragController.update(new Point(event.x, event.y));
+ _dragController.drop();
+ _dragController = null;
+ _displacement = Offset.zero;
+ });
+ return EventDisposition.consumed;
+ }
+
+ Widget build() {
+ List<Widget> layers = <Widget>[
+ new Flex([
+ new ExampleDragTarget(),
+ new ExampleDragTarget(),
+ new ExampleDragTarget(),
+ new ExampleDragTarget(),
+ ]),
+ new Positioned(
+ top: kTop,
+ left: kLeft,
+ child: new Listener(
+ onPointerDown: _startDrag,
+ onPointerMove: _updateDrag,
+ onPointerCancel: _cancelDrag,
+ onPointerUp: _drop,
+ child: new Dot()
+ )
+ ),
+ ];
+
+ if (_dragController != null) {
+ layers.add(
+ new Positioned(
+ top: kTop + _displacement.dy,
+ left: kLeft + _displacement.dx,
+ child: new IgnorePointer(
+ child: new Opacity(
+ opacity: 0.5,
+ child: new Dot()
+ )
+ )
+ )
+ );
+ }
+
+ return new Container(
+ decoration: new BoxDecoration(backgroundColor: colors.Pink[500]),
+ child: new Stack(layers)
+ );
+ }
+}
+
+void main() {
+ runApp(new DragAndDropApp());
+}
diff --git a/examples/widgets/overlay_geometry.dart b/examples/widgets/overlay_geometry.dart
index c4f81a1..a3a6d3c 100644
--- a/examples/widgets/overlay_geometry.dart
+++ b/examples/widgets/overlay_geometry.dart
@@ -115,7 +115,7 @@
setState(() {
markers[MarkerType.touch] = new Point(event.x, event.y);
markers[MarkerType.topLeft] = target.localToGlobal(new Point(0.0, 0.0));
- Size size = (target.root as RenderBox).size;
+ Size size = (target.renderObject as RenderBox).size;
markers[MarkerType.bottomRight] = target.localToGlobal(new Point(size.width, size.height));
Scrollable scrollable = findScrollableAncestor(target: target);
diff --git a/examples/widgets/progress_indicator.dart b/examples/widgets/progress_indicator.dart
index df06c45..5d8d1a3 100644
--- a/examples/widgets/progress_indicator.dart
+++ b/examples/widgets/progress_indicator.dart
@@ -20,12 +20,12 @@
class ProgressIndicatorApp extends App {
- AnimationPerformance valueAnimation;
+ ValueAnimation<double> valueAnimation;
Direction valueAnimationDirection = Direction.forward;
void initState() {
super.initState();
- valueAnimation = new AnimationPerformance()
+ valueAnimation = new ValueAnimation<double>()
..duration = const Duration(milliseconds: 1500)
..variable = new AnimatedValue<double>(
0.0,
@@ -59,17 +59,17 @@
),
new LinearProgressIndicator(),
new LinearProgressIndicator(),
- new LinearProgressIndicator(value: valueAnimation.variable.value),
+ new LinearProgressIndicator(value: valueAnimation.value),
new CircularProgressIndicator(),
new SizedBox(
width: 20.0,
height: 20.0,
- child: new CircularProgressIndicator(value: valueAnimation.variable.value)
+ child: new CircularProgressIndicator(value: valueAnimation.value)
),
new SizedBox(
width: 50.0,
height: 30.0,
- child: new CircularProgressIndicator(value: valueAnimation.variable.value)
+ child: new CircularProgressIndicator(value: valueAnimation.value)
)
];
return new Flex(
diff --git a/sky/packages/sky/lib/animation/README.md b/sky/packages/sky/lib/animation/README.md
index 3384c45..55f96ca 100644
--- a/sky/packages/sky/lib/animation/README.md
+++ b/sky/packages/sky/lib/animation/README.md
@@ -1,2 +1,2 @@
This directory contains animation-related libraries that only depend
-on core Dart libraries and ../base/*.
+on core Dart libraries, the Newton Dart library, and ../base/*.
diff --git a/sky/packages/sky/lib/animation/animated_simulation.dart b/sky/packages/sky/lib/animation/animated_simulation.dart
index 4e492c4..b3278e2 100644
--- a/sky/packages/sky/lib/animation/animated_simulation.dart
+++ b/sky/packages/sky/lib/animation/animated_simulation.dart
@@ -33,11 +33,11 @@
_animationId = null;
}
+ // We take the _completer into a local variable so that !isTicking
+ // when we actually complete the future (isTicking uses _completer
+ // to determine its state).
Completer localCompleter = _completer;
_completer = null;
-
- // We take the _completer into a local variable so that !isTicking when we
- // actually complete the future.
assert(!isTicking);
localCompleter.complete();
}
diff --git a/sky/packages/sky/lib/animation/forces.dart b/sky/packages/sky/lib/animation/forces.dart
index cf5f53a..6353c8a 100644
--- a/sky/packages/sky/lib/animation/forces.dart
+++ b/sky/packages/sky/lib/animation/forces.dart
@@ -10,27 +10,34 @@
}
class SpringForce extends Force {
- SpringForce(this.spring, {this.left: 0.0, this.right: 1.0});
-
- // We overshoot the target by this distance, but stop the simulation when
- // the spring gets within this distance (regardless of how fast it's moving).
- // This causes the spring to settle a bit faster than it otherwise would.
- static final Tolerance tolerance =
- new Tolerance(velocity: double.INFINITY, distance: 0.01);
+ SpringForce(this.spring, { this.left: 0.0, this.right: 1.0 });
final SpringDescription spring;
+
// Where to put the spring's resting point when releasing left or right,
// respectively.
final double left, right;
+ // We overshoot the target by this distance, but stop the simulation when
+ // the spring gets within this distance (regardless of how fast it's moving).
+ // This causes the spring to settle a bit faster than it otherwise would.
+ static final Tolerance tolerance = new Tolerance(
+ velocity: double.INFINITY,
+ distance: 0.01
+ );
+
Simulation release(double position, double velocity) {
- double target = velocity < 0.0 ?
- this.left - tolerance.distance : this.right + tolerance.distance;
+ double target = velocity < 0.0 ? this.left - tolerance.distance
+ : this.right + tolerance.distance;
return new SpringSimulation(spring, position, target, velocity)
..tolerance = tolerance;
}
}
-final SpringDescription _kDefaultSpringDesc =
- new SpringDescription.withDampingRatio(mass: 1.0, springConstant: 500.0, ratio: 1.0);
+final SpringDescription _kDefaultSpringDesc = new SpringDescription.withDampingRatio(
+ mass: 1.0,
+ springConstant: 500.0,
+ ratio: 1.0
+);
+
final SpringForce kDefaultSpringForce = new SpringForce(_kDefaultSpringDesc);
diff --git a/sky/packages/sky/lib/base/lerp.dart b/sky/packages/sky/lib/base/lerp.dart
index 80e2a2c..da5c144 100644
--- a/sky/packages/sky/lib/base/lerp.dart
+++ b/sky/packages/sky/lib/base/lerp.dart
@@ -26,10 +26,11 @@
if (b == null)
return _scaleAlpha(a, 1.0 - t);
return new Color.fromARGB(
- lerpNum(a.alpha, b.alpha, t).toInt(),
- lerpNum(a.red, b.red, t).toInt(),
- lerpNum(a.green, b.green, t).toInt(),
- lerpNum(a.blue, b.blue, t).toInt());
+ lerpNum(a.alpha, b.alpha, t).toInt(),
+ lerpNum(a.red, b.red, t).toInt(),
+ lerpNum(a.green, b.green, t).toInt(),
+ lerpNum(a.blue, b.blue, t).toInt()
+ );
}
Offset lerpOffset(Offset a, Offset b, double t) {
@@ -55,5 +56,6 @@
lerpNum(a.left, b.left, t),
lerpNum(a.top, b.top, t),
lerpNum(a.right, b.right, t),
- lerpNum(a.bottom, b.bottom, t));
+ lerpNum(a.bottom, b.bottom, t)
+ );
}
diff --git a/sky/packages/sky/lib/mojo/asset_bundle.dart b/sky/packages/sky/lib/mojo/asset_bundle.dart
index bb2ff84..7cce717 100644
--- a/sky/packages/sky/lib/mojo/asset_bundle.dart
+++ b/sky/packages/sky/lib/mojo/asset_bundle.dart
@@ -18,6 +18,7 @@
void close();
ImageResource loadImage(String key);
Future<String> loadString(String key);
+ Future<core.MojoDataPipeConsumer> load(String key);
}
class NetworkAssetBundle extends AssetBundle {
@@ -27,13 +28,15 @@
void close() { }
- ImageResource loadImage(String key) {
- return image_cache.load(_baseUrl.resolve(key).toString());
+ String _urlFromKey(String key) => _baseUrl.resolve(key).toString();
+
+ Future<core.MojoDataPipeConsumer> load(String key) async {
+ return (await fetchUrl(_urlFromKey(key))).body;
}
- Future<String> loadString(String key) {
- return fetchString(_baseUrl.resolve(key).toString());
- }
+ ImageResource loadImage(String key) => image_cache.load(_urlFromKey(key));
+
+ Future<String> loadString(String key) => fetchString(_urlFromKey(key));
}
Future _fetchAndUnpackBundle(String relativeUrl, AssetBundleProxy bundle) async {
@@ -66,19 +69,23 @@
ImageResource loadImage(String key) {
return _imageCache.putIfAbsent(key, () {
Completer<sky.Image> completer = new Completer<sky.Image>();
- _bundle.ptr.getAsStream(key).then((response) {
- new sky.ImageDecoder(response.assetData.handle.h, completer.complete);
+ load(key).then((assetData) {
+ new sky.ImageDecoder(assetData.handle.h, completer.complete);
});
return new ImageResource(completer.future);
});
}
Future<String> _fetchString(String key) async {
- core.MojoDataPipeConsumer pipe = (await _bundle.ptr.getAsStream(key)).assetData;
+ core.MojoDataPipeConsumer pipe = await load(key);
ByteData data = await core.DataPipeDrainer.drainHandle(pipe);
return new String.fromCharCodes(new Uint8List.view(data.buffer));
}
+ Future<core.MojoDataPipeConsumer> load(String key) async {
+ return (await _bundle.ptr.getAsStream(key)).assetData;
+ }
+
Future<String> loadString(String key) {
return _stringCache.putIfAbsent(key, () => _fetchString(key));
}
diff --git a/sky/packages/sky/lib/mojo/net/fetch.dart b/sky/packages/sky/lib/mojo/net/fetch.dart
index 56a3b22..042e527 100644
--- a/sky/packages/sky/lib/mojo/net/fetch.dart
+++ b/sky/packages/sky/lib/mojo/net/fetch.dart
@@ -12,6 +12,8 @@
import 'package:mojo_services/mojo/url_loader.mojom.dart';
import 'package:sky/mojo/shell.dart' as shell;
+export 'package:mojo/mojo/url_response.mojom.dart' show UrlResponse;
+
NetworkServiceProxy _initNetworkService() {
NetworkServiceProxy networkService = new NetworkServiceProxy.unbound();
shell.requestService("mojo:authenticated_network_service", networkService);
diff --git a/sky/packages/sky/lib/painting/README.md b/sky/packages/sky/lib/painting/README.md
new file mode 100644
index 0000000..64967d7
--- /dev/null
+++ b/sky/packages/sky/lib/painting/README.md
@@ -0,0 +1,3 @@
+This directory contains painting-related libraries that only depend on
+core Dart libraries, ../base/*, and ../animation/*. Note that
+../animation/* depends on the Newton Dart library also.
diff --git a/sky/packages/sky/lib/painting/box_painter.dart b/sky/packages/sky/lib/painting/box_painter.dart
index 7cc5054..251aea7 100644
--- a/sky/packages/sky/lib/painting/box_painter.dart
+++ b/sky/packages/sky/lib/painting/box_painter.dart
@@ -91,9 +91,10 @@
if (b == null)
return a.scale(1.0 - t);
return new BoxShadow(
- color: lerpColor(a.color, b.color, t),
- offset: lerpOffset(a.offset, b.offset, t),
- blur: lerpNum(a.blur, b.blur, t));
+ color: lerpColor(a.color, b.color, t),
+ offset: lerpOffset(a.offset, b.offset, t),
+ blur: lerpNum(a.blur, b.blur, t)
+ );
}
List<BoxShadow> lerpListBoxShadow(List<BoxShadow> a, List<BoxShadow> b, double t) {
@@ -126,18 +127,19 @@
this.tileMode: sky.TileMode.clamp
});
- String toString() =>
- 'LinearGradient($endPoints, $colors, $colorStops, $tileMode)';
-
- sky.Shader createShader() {
- return new sky.Gradient.linear(this.endPoints, this.colors, this.colorStops,
- this.tileMode);
- }
-
final List<Point> endPoints;
final List<Color> colors;
final List<double> colorStops;
final sky.TileMode tileMode;
+
+ sky.Shader createShader() {
+ return new sky.Gradient.linear(this.endPoints, this.colors,
+ this.colorStops, this.tileMode);
+ }
+
+ String toString() {
+ return 'LinearGradient($endPoints, $colors, $colorStops, $tileMode)';
+ }
}
class RadialGradient extends Gradient {
@@ -149,19 +151,20 @@
this.tileMode: sky.TileMode.clamp
});
- String toString() =>
- 'RadialGradient($center, $radius, $colors, $colorStops, $tileMode)';
+ final Point center;
+ final double radius;
+ final List<Color> colors;
+ final List<double> colorStops;
+ final sky.TileMode tileMode;
sky.Shader createShader() {
return new sky.Gradient.radial(this.center, this.radius, this.colors,
this.colorStops, this.tileMode);
}
- final Point center;
- final double radius;
- final List<Color> colors;
- final List<double> colorStops;
- final sky.TileMode tileMode;
+ String toString() {
+ return 'RadialGradient($center, $radius, $colors, $colorStops, $tileMode)';
+ }
}
enum BackgroundFit { fill, contain, cover, none, scaleDown }
@@ -358,7 +361,8 @@
}
void _paintBackgroundColor(sky.Canvas canvas, Rect rect) {
- if (_decoration.backgroundColor != null || _decoration.boxShadow != null ||
+ if (_decoration.backgroundColor != null ||
+ _decoration.boxShadow != null ||
_decoration.gradient != null) {
switch (_decoration.shape) {
case Shape.circle:
diff --git a/sky/packages/sky/lib/rendering/sky_binding.dart b/sky/packages/sky/lib/rendering/sky_binding.dart
index b81c82c..d77e5a3 100644
--- a/sky/packages/sky/lib/rendering/sky_binding.dart
+++ b/sky/packages/sky/lib/rendering/sky_binding.dart
@@ -85,9 +85,7 @@
if (event is sky.PointerEvent) {
_handlePointerEvent(event);
} else if (event is sky.GestureEvent) {
- HitTestResult result = new HitTestResult();
- _renderView.hitTest(result, position: new Point(event.x, event.y));
- dispatchEvent(event, result);
+ dispatchEvent(event, hitTest(new Point(event.x, event.y)));
} else {
for (EventListener e in _eventListeners)
e(event);
@@ -97,8 +95,7 @@
Map<int, PointerState> _stateForPointer = new Map<int, PointerState>();
PointerState _createStateForPointer(sky.PointerEvent event, Point position) {
- HitTestResult result = new HitTestResult();
- _renderView.hitTest(result, position: position);
+ HitTestResult result = hitTest(position);
PointerState state = new PointerState(result: result, lastPosition: position);
_stateForPointer[event.pointer] = state;
return state;
@@ -128,6 +125,12 @@
return dispatchEvent(event, state.result);
}
+ HitTestResult hitTest(Point position) {
+ HitTestResult result = new HitTestResult();
+ _renderView.hitTest(result, position: position);
+ return result;
+ }
+
EventDisposition dispatchEvent(sky.Event event, HitTestResult result) {
assert(result != null);
EventDisposition disposition = EventDisposition.ignored;
diff --git a/sky/packages/sky/lib/widgets.dart b/sky/packages/sky/lib/widgets.dart
index 65fb174..309caea 100644
--- a/sky/packages/sky/lib/widgets.dart
+++ b/sky/packages/sky/lib/widgets.dart
@@ -14,6 +14,7 @@
export 'widgets/default_text_style.dart';
export 'widgets/dialog.dart';
export 'widgets/dismissable.dart';
+export 'widgets/drag_target.dart';
export 'widgets/drawer.dart';
export 'widgets/drawer_divider.dart';
export 'widgets/drawer_header.dart';
diff --git a/sky/packages/sky/lib/widgets/basic.dart b/sky/packages/sky/lib/widgets/basic.dart
index 88d5264..344dca7 100644
--- a/sky/packages/sky/lib/widgets/basic.dart
+++ b/sky/packages/sky/lib/widgets/basic.dart
@@ -37,11 +37,11 @@
final double opacity;
RenderOpacity createNode() => new RenderOpacity(opacity: opacity);
- RenderOpacity get root => super.root;
+ RenderOpacity get renderObject => super.renderObject;
void syncRenderObject(Opacity old) {
super.syncRenderObject(old);
- root.opacity = opacity;
+ renderObject.opacity = opacity;
}
}
@@ -53,12 +53,12 @@
final sky.TransferMode transferMode;
RenderColorFilter createNode() => new RenderColorFilter(color: color, transferMode: transferMode);
- RenderColorFilter get root => super.root;
+ RenderColorFilter get renderObject => super.renderObject;
void syncRenderObject(ColorFilter old) {
super.syncRenderObject(old);
- root.color = color;
- root.transferMode = transferMode;
+ renderObject.color = color;
+ renderObject.transferMode = transferMode;
}
}
@@ -69,11 +69,11 @@
final BoxDecoration decoration;
RenderDecoratedBox createNode() => new RenderDecoratedBox(decoration: decoration);
- RenderDecoratedBox get root => super.root;
+ RenderDecoratedBox get renderObject => super.renderObject;
void syncRenderObject(DecoratedBox old) {
super.syncRenderObject(old);
- root.decoration = decoration;
+ renderObject.decoration = decoration;
}
}
@@ -85,17 +85,17 @@
final dynamic token; // set this to be repainted automatically when the token changes
RenderCustomPaint createNode() => new RenderCustomPaint(callback: callback);
- RenderCustomPaint get root => super.root;
+ RenderCustomPaint get renderObject => super.renderObject;
void syncRenderObject(CustomPaint old) {
super.syncRenderObject(old);
if (old != null && old.token != token)
- root.markNeedsPaint();
- root.callback = callback;
+ renderObject.markNeedsPaint();
+ renderObject.callback = callback;
}
void remove() {
- root.callback = null;
+ renderObject.callback = null;
super.remove();
}
}
@@ -105,7 +105,7 @@
: super(key: key, child: child);
RenderClipRect createNode() => new RenderClipRect();
- RenderClipRect get root => super.root;
+ RenderClipRect get renderObject => super.renderObject;
// Nothing to sync, so we don't implement syncRenderObject()
}
@@ -118,12 +118,12 @@
final double yRadius;
RenderClipRRect createNode() => new RenderClipRRect(xRadius: xRadius, yRadius: yRadius);
- RenderClipRRect get root => super.root;
+ RenderClipRRect get renderObject => super.renderObject;
void syncRenderObject(ClipRRect old) {
super.syncRenderObject(old);
- root.xRadius = xRadius;
- root.yRadius = yRadius;
+ renderObject.xRadius = xRadius;
+ renderObject.yRadius = yRadius;
}
}
@@ -132,7 +132,7 @@
: super(key: key, child: child);
RenderClipOval createNode() => new RenderClipOval();
- RenderClipOval get root => super.root;
+ RenderClipOval get renderObject => super.renderObject;
// Nothing to sync, so we don't implement syncRenderObject()
}
@@ -147,11 +147,11 @@
final Matrix4 transform;
RenderTransform createNode() => new RenderTransform(transform: transform);
- RenderTransform get root => super.root;
+ RenderTransform get renderObject => super.renderObject;
void syncRenderObject(Transform old) {
super.syncRenderObject(old);
- root.transform = transform;
+ renderObject.transform = transform;
}
}
@@ -162,11 +162,11 @@
final EdgeDims padding;
RenderPadding createNode() => new RenderPadding(padding: padding);
- RenderPadding get root => super.root;
+ RenderPadding get renderObject => super.renderObject;
void syncRenderObject(Padding old) {
super.syncRenderObject(old);
- root.padding = padding;
+ renderObject.padding = padding;
}
}
@@ -175,7 +175,7 @@
: super(key: key, child: child);
RenderPositionedBox createNode() => new RenderPositionedBox();
- RenderPositionedBox get root => super.root;
+ RenderPositionedBox get renderObject => super.renderObject;
// Nothing to sync, so we don't implement syncRenderObject()
}
@@ -188,7 +188,7 @@
final double height;
RenderConstrainedBox createNode() => new RenderConstrainedBox(additionalConstraints: _additionalConstraints());
- RenderConstrainedBox get root => super.root;
+ RenderConstrainedBox get renderObject => super.renderObject;
BoxConstraints _additionalConstraints() {
BoxConstraints result = const BoxConstraints();
@@ -201,7 +201,7 @@
void syncRenderObject(SizedBox old) {
super.syncRenderObject(old);
- root.additionalConstraints = _additionalConstraints();
+ renderObject.additionalConstraints = _additionalConstraints();
}
}
@@ -212,11 +212,11 @@
final BoxConstraints constraints;
RenderConstrainedBox createNode() => new RenderConstrainedBox(additionalConstraints: constraints);
- RenderConstrainedBox get root => super.root;
+ RenderConstrainedBox get renderObject => super.renderObject;
void syncRenderObject(ConstrainedBox old) {
super.syncRenderObject(old);
- root.additionalConstraints = constraints;
+ renderObject.additionalConstraints = constraints;
}
}
@@ -227,11 +227,11 @@
final double aspectRatio;
RenderAspectRatio createNode() => new RenderAspectRatio(aspectRatio: aspectRatio);
- RenderAspectRatio get root => super.root;
+ RenderAspectRatio get renderObject => super.renderObject;
void syncRenderObject(AspectRatio old) {
super.syncRenderObject(old);
- root.aspectRatio = aspectRatio;
+ renderObject.aspectRatio = aspectRatio;
}
}
@@ -243,12 +243,12 @@
final double stepHeight;
RenderShrinkWrapWidth createNode() => new RenderShrinkWrapWidth();
- RenderShrinkWrapWidth get root => super.root;
+ RenderShrinkWrapWidth get renderObject => super.renderObject;
void syncRenderObject(ShrinkWrapWidth old) {
super.syncRenderObject(old);
- root.stepWidth = stepWidth;
- root.stepHeight = stepHeight;
+ renderObject.stepWidth = stepWidth;
+ renderObject.stepHeight = stepHeight;
}
}
@@ -260,12 +260,12 @@
final TextBaseline baselineType;
RenderBaseline createNode() => new RenderBaseline(baseline: baseline, baselineType: baselineType);
- RenderBaseline get root => super.root;
+ RenderBaseline get renderObject => super.renderObject;
void syncRenderObject(Baseline old) {
super.syncRenderObject(old);
- root.baseline = baseline;
- root.baselineType = baselineType;
+ renderObject.baseline = baseline;
+ renderObject.baselineType = baselineType;
}
}
@@ -281,12 +281,12 @@
final ScrollDirection scrollDirection;
RenderViewport createNode() => new RenderViewport(scrollOffset: scrollOffset, scrollDirection: scrollDirection);
- RenderViewport get root => super.root;
+ RenderViewport get renderObject => super.renderObject;
void syncRenderObject(Viewport old) {
super.syncRenderObject(old);
- root.scrollOffset = scrollOffset;
- root.scrollDirection = scrollDirection;
+ renderObject.scrollOffset = scrollOffset;
+ renderObject.scrollDirection = scrollDirection;
}
}
@@ -297,15 +297,15 @@
final SizeChangedCallback callback;
RenderSizeObserver createNode() => new RenderSizeObserver(callback: callback);
- RenderSizeObserver get root => super.root;
+ RenderSizeObserver get renderObject => super.renderObject;
void syncRenderObject(SizeObserver old) {
super.syncRenderObject(old);
- root.callback = callback;
+ renderObject.callback = callback;
}
void remove() {
- root.callback = null;
+ renderObject.callback = null;
super.remove();
}
}
@@ -381,11 +381,11 @@
final BlockDirection direction;
RenderBlock createNode() => new RenderBlock(direction: direction);
- RenderBlock get root => super.root;
+ RenderBlock get renderObject => super.renderObject;
void syncRenderObject(Widget old) {
super.syncRenderObject(old);
- root.direction = direction;
+ renderObject.direction = direction;
}
}
@@ -394,7 +394,7 @@
: super(key: key, children: children);
RenderStack createNode() => new RenderStack();
- RenderStack get root => super.root;
+ RenderStack get renderObject => super.renderObject;
}
class Positioned extends ParentDataNode {
@@ -429,14 +429,14 @@
final TextBaseline textBaseline;
RenderFlex createNode() => new RenderFlex(direction: direction);
- RenderFlex get root => super.root;
+ RenderFlex get renderObject => super.renderObject;
void syncRenderObject(Widget old) {
super.syncRenderObject(old);
- root.direction = direction;
- root.justifyContent = justifyContent;
- root.alignItems = alignItems;
- root.textBaseline = textBaseline;
+ renderObject.direction = direction;
+ renderObject.justifyContent = justifyContent;
+ renderObject.alignItems = alignItems;
+ renderObject.textBaseline = textBaseline;
}
}
@@ -452,11 +452,11 @@
final TextSpan text;
RenderParagraph createNode() => new RenderParagraph(text);
- RenderParagraph get root => super.root;
+ RenderParagraph get renderObject => super.renderObject;
void syncRenderObject(Widget old) {
super.syncRenderObject(old);
- root.text = text;
+ renderObject.text = text;
}
}
@@ -520,14 +520,14 @@
final sky.ColorFilter colorFilter;
RenderImage createNode() => new RenderImage(image: image, width: width, height: height, colorFilter: colorFilter);
- RenderImage get root => super.root;
+ RenderImage get renderObject => super.renderObject;
void syncRenderObject(Widget old) {
super.syncRenderObject(old);
- root.image = image;
- root.width = width;
- root.height = height;
- root.colorFilter = colorFilter;
+ renderObject.image = image;
+ renderObject.width = width;
+ renderObject.height = height;
+ renderObject.colorFilter = colorFilter;
}
}
@@ -626,20 +626,20 @@
final RenderBox renderBox;
RenderBox createNode() => this.renderBox;
- RenderBox get root => super.root;
+ RenderBox get renderObject => super.renderObject;
void syncRenderObject(Widget old) {
super.syncRenderObject(old);
if (old != null) {
assert(old is WidgetToRenderBoxAdapter);
- assert(root == old.root);
+ assert(renderObject == old.renderObject);
}
}
void remove() {
RenderObjectWrapper ancestor = findAncestorRenderObjectWrapper();
assert(ancestor is RenderObjectWrapper);
- assert(ancestor.root == root.parent);
+ assert(ancestor.renderObject == renderObject.parent);
ancestor.detachChildRoot(this);
super.remove();
}
@@ -652,5 +652,5 @@
IgnorePointer({ Key key, Widget child })
: super(key: key, child: child);
RenderIgnorePointer createNode() => new RenderIgnorePointer();
- RenderIgnorePointer get root => super.root;
+ RenderIgnorePointer get renderObject => super.renderObject;
}
diff --git a/sky/packages/sky/lib/widgets/block_viewport.dart b/sky/packages/sky/lib/widgets/block_viewport.dart
index 8bc30c5..04dd891 100644
--- a/sky/packages/sky/lib/widgets/block_viewport.dart
+++ b/sky/packages/sky/lib/widgets/block_viewport.dart
@@ -88,7 +88,7 @@
Object token;
BlockViewportLayoutState layoutState;
- RenderBlockViewport get root => super.root;
+ RenderBlockViewport get renderObject => super.renderObject;
RenderBlockViewport createNode() => new RenderBlockViewport();
void walkChildren(WidgetTreeWalker walker) {
@@ -101,20 +101,20 @@
void insertChildRoot(RenderObjectWrapper child, dynamic slot) {
if (slot == _omit)
return;
- final root = this.root; // TODO(ianh): Remove this once the analyzer is cleverer
+ final renderObject = this.renderObject; // TODO(ianh): Remove this once the analyzer is cleverer
assert(slot == null || slot is RenderObject);
- assert(root is ContainerRenderObjectMixin);
- root.add(child.root, before: slot);
- assert(root == this.root); // TODO(ianh): Remove this once the analyzer is cleverer
+ assert(renderObject is ContainerRenderObjectMixin);
+ renderObject.add(child.renderObject, before: slot);
+ assert(renderObject == this.renderObject); // TODO(ianh): Remove this once the analyzer is cleverer
}
void detachChildRoot(RenderObjectWrapper child) {
- final root = this.root; // TODO(ianh): Remove this once the analyzer is cleverer
- assert(root is ContainerRenderObjectMixin);
- if (child.root.parent != root)
+ final renderObject = this.renderObject; // TODO(ianh): Remove this once the analyzer is cleverer
+ assert(renderObject is ContainerRenderObjectMixin);
+ if (child.renderObject.parent != renderObject)
return; // probably had slot == _omit when inserted
- root.remove(child.root);
- assert(root == this.root); // TODO(ianh): Remove this once the analyzer is cleverer
+ renderObject.remove(child.renderObject);
+ assert(renderObject == this.renderObject); // TODO(ianh): Remove this once the analyzer is cleverer
}
void remove() {
@@ -126,12 +126,12 @@
}
void didMount() {
- root.callback = layout;
+ renderObject.callback = layout;
super.didMount();
}
void didUnmount() {
- root.callback = null;
+ renderObject.callback = null;
super.didUnmount();
}
@@ -173,12 +173,12 @@
void syncRenderObject(BlockViewport old) {
super.syncRenderObject(old);
if (layoutState._dirty || !layoutState.isValid) {
- root.markNeedsLayout();
+ renderObject.markNeedsLayout();
} else {
if (layoutState._visibleChildCount > 0) {
assert(layoutState.firstVisibleChildIndex >= 0);
assert(builder != null);
- assert(root != null);
+ assert(renderObject != null);
final int startIndex = layoutState._firstVisibleChildIndex;
int lastIndex = startIndex + layoutState._visibleChildCount - 1;
for (int index = startIndex; index <= lastIndex; index += 1) {
@@ -188,8 +188,8 @@
_Key key = new _Key.fromWidget(widget);
Widget oldWidget = layoutState._childrenByKey[key];
assert(oldWidget != null);
- assert(oldWidget.root.parent == root);
- widget = syncChild(widget, oldWidget, root.childAfter(oldWidget.root));
+ assert(oldWidget.renderObject.parent == renderObject);
+ widget = syncChild(widget, oldWidget, renderObject.childAfter(oldWidget.renderObject));
assert(widget != null);
layoutState._childrenByKey[key] = widget;
}
@@ -214,7 +214,7 @@
newWidget = syncChild(newWidget, oldWidget, _omit);
assert(newWidget != null);
// Update the offsets based on the newWidget's height.
- RenderBox widgetRoot = newWidget.root;
+ RenderBox widgetRoot = newWidget.renderObject;
assert(widgetRoot is RenderBox);
double newHeight = widgetRoot.getMaxIntrinsicHeight(innerConstraints);
double oldHeight = offsets[index + 1] - offsets[index];
@@ -237,7 +237,7 @@
if (index >= offsets.length - 1) {
assert(index == offsets.length - 1);
final double widgetStartOffset = offsets[index];
- RenderBox widgetRoot = widget.root;
+ RenderBox widgetRoot = widget.renderObject;
assert(widgetRoot is RenderBox);
final double widgetEndOffset = widgetStartOffset + widgetRoot.getMaxIntrinsicHeight(innerConstraints);
offsets.add(widgetEndOffset);
@@ -266,7 +266,7 @@
final List<double> offsets = layoutState._childOffsets;
final Map<_Key, Widget> childrenByKey = layoutState._childrenByKey;
- final double height = root.size.height;
+ final double height = renderObject.size.height;
final double endOffset = startOffset + height;
BoxConstraints innerConstraints = new BoxConstraints.tightFor(width: constraints.constrainWidth());
@@ -362,7 +362,7 @@
int index = startIndex;
if (haveChildren) {
// Build all the widgets we need.
- root.startOffset = offsets[index] - startOffset;
+ renderObject.startOffset = offsets[index] - startOffset;
while (offsets[index] < endOffset) {
if (!builtChildren.containsKey(index)) {
Widget widget = _getWidget(index, innerConstraints);
@@ -392,14 +392,14 @@
while (index > startIndex) {
index -= 1;
Widget widget = builtChildren[index];
- if (widget.root.parent == root) {
- root.move(widget.root, before: nextSibling);
+ if (widget.renderObject.parent == renderObject) {
+ renderObject.move(widget.renderObject, before: nextSibling);
} else {
- assert(widget.root.parent == null);
- root.add(widget.root, before: nextSibling);
+ assert(widget.renderObject.parent == null);
+ renderObject.add(widget.renderObject, before: nextSibling);
}
widget.updateSlot(nextSibling);
- nextSibling = widget.root;
+ nextSibling = widget.renderObject;
}
}
diff --git a/sky/packages/sky/lib/widgets/checkbox.dart b/sky/packages/sky/lib/widgets/checkbox.dart
index d9a050b..6e615d0 100644
--- a/sky/packages/sky/lib/widgets/checkbox.dart
+++ b/sky/packages/sky/lib/widgets/checkbox.dart
@@ -64,16 +64,16 @@
final Color uncheckedColor;
final Color accentColor;
- _RenderCheckbox get root => super.root;
+ _RenderCheckbox get renderObject => super.renderObject;
_RenderCheckbox createNode() => new _RenderCheckbox(
value: value, uncheckedColor: uncheckedColor, onChanged: onChanged);
void syncRenderObject(_CheckboxWrapper old) {
super.syncRenderObject(old);
- root.value = value;
- root.onChanged = onChanged;
- root.uncheckedColor = uncheckedColor;
- root.accentColor = accentColor;
+ renderObject.value = value;
+ renderObject.onChanged = onChanged;
+ renderObject.uncheckedColor = uncheckedColor;
+ renderObject.accentColor = accentColor;
}
}
diff --git a/sky/packages/sky/lib/widgets/default_text_style.dart b/sky/packages/sky/lib/widgets/default_text_style.dart
index 9d810be..c4a763d 100644
--- a/sky/packages/sky/lib/widgets/default_text_style.dart
+++ b/sky/packages/sky/lib/widgets/default_text_style.dart
@@ -19,8 +19,8 @@
final TextStyle style;
- static TextStyle of(Component component) {
- DefaultTextStyle result = component.inheritedOfType(DefaultTextStyle);
+ static TextStyle of(Widget widget) {
+ DefaultTextStyle result = widget.inheritedOfType(DefaultTextStyle);
return result == null ? null : result.style;
}
diff --git a/sky/packages/sky/lib/widgets/drag_target.dart b/sky/packages/sky/lib/widgets/drag_target.dart
new file mode 100644
index 0000000..7f9402b
--- /dev/null
+++ b/sky/packages/sky/lib/widgets/drag_target.dart
@@ -0,0 +1,119 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:collection';
+
+import 'package:sky/base/hit_test.dart';
+import 'package:sky/rendering/sky_binding.dart';
+import 'package:sky/widgets/basic.dart';
+import 'package:sky/widgets/framework.dart';
+
+typedef bool DragTargetWillAccept<T>(T data);
+typedef void DragTargetAccept<T>(T data);
+typedef Widget DragTargetBuilder<T>(List<T> candidateData, List<dynamic> rejectedData);
+
+class DragTarget<T> extends StatefulComponent {
+ DragTarget({
+ Key key,
+ this.builder,
+ this.onWillAccept,
+ this.onAccept
+ }) : super(key: key);
+
+ DragTargetBuilder<T> builder;
+ DragTargetWillAccept<T> onWillAccept;
+ DragTargetAccept<T> onAccept;
+
+ final List<T> _candidateData = new List<T>();
+ final List<dynamic> _rejectedData = new List<dynamic>();
+
+ void syncFields(DragTarget source) {
+ builder = source.builder;
+ onWillAccept = source.onWillAccept;
+ onAccept = source.onAccept;
+ }
+
+ bool didEnter(dynamic data) {
+ assert(!_candidateData.contains(data));
+ assert(!_rejectedData.contains(data));
+ if (data is T && (onWillAccept == null || onWillAccept(data))) {
+ setState(() {
+ _candidateData.add(data);
+ });
+ return true;
+ }
+ _rejectedData.add(data);
+ return false;
+ }
+
+ void didLeave(dynamic data) {
+ assert(_candidateData.contains(data) || _rejectedData.contains(data));
+ setState(() {
+ _candidateData.remove(data);
+ _rejectedData.remove(data);
+ });
+ }
+
+ void didDrop(dynamic data) {
+ assert(_candidateData.contains(data));
+ setState(() {
+ _candidateData.remove(data);
+ });
+ if (onAccept != null)
+ onAccept(data);
+ }
+
+ Widget build() {
+ return builder(new UnmodifiableListView<T>(_candidateData),
+ new UnmodifiableListView<dynamic>(_rejectedData));
+ }
+}
+
+class DragController {
+ DragController(this.data);
+
+ final dynamic data;
+
+ DragTarget _activeTarget;
+ bool _activeTargetWillAcceptDrop = false;
+
+ DragTarget _getDragTarget(List<HitTestEntry> path) {
+ for (HitTestEntry entry in path.reversed) {
+ for (Widget widget in RenderObjectWrapper.getWidgetsForRenderObject(entry.target)) {
+ if (widget is DragTarget)
+ return widget;
+ }
+ }
+ return null;
+ }
+
+ void update(Point globalPosition) {
+ HitTestResult result = SkyBinding.instance.hitTest(globalPosition);
+ DragTarget target = _getDragTarget(result.path);
+ if (target == _activeTarget)
+ return;
+ if (_activeTarget != null)
+ _activeTarget.didLeave(data);
+ _activeTarget = target;
+ _activeTargetWillAcceptDrop = _activeTarget != null && _activeTarget.didEnter(data);
+ }
+
+ void cancel() {
+ if (_activeTarget != null)
+ _activeTarget.didLeave(data);
+ _activeTarget = null;
+ _activeTargetWillAcceptDrop = false;
+ }
+
+ void drop() {
+ if (_activeTarget == null)
+ return;
+ if (_activeTargetWillAcceptDrop)
+ _activeTarget.didDrop(data);
+ else
+ _activeTarget.didLeave(data);
+ _activeTarget = null;
+ _activeTargetWillAcceptDrop = false;
+ }
+}
diff --git a/sky/packages/sky/lib/widgets/framework.dart b/sky/packages/sky/lib/widgets/framework.dart
index 8453a68..8b15043 100644
--- a/sky/packages/sky/lib/widgets/framework.dart
+++ b/sky/packages/sky/lib/widgets/framework.dart
@@ -248,10 +248,10 @@
(key as GlobalKey)._unregister(this); // TODO(ianh): remove cast when analyzer is cleverer
}
- RenderObject _root;
+ RenderObject _renderObject;
/// The underlying [RenderObject] associated with this [Widget].
- RenderObject get root => _root;
+ RenderObject get renderObject => _renderObject;
// Subclasses which implements Nodes that become stateful may return true
// if the node has become stateful and should be retained.
@@ -272,8 +272,29 @@
return ancestor;
}
+ Set<Type> _dependencies;
+ Inherited inheritedOfType(Type targetType) {
+ if (_dependencies == null)
+ _dependencies = new Set<Type>();
+ _dependencies.add(targetType);
+ Widget ancestor = parent;
+ while (ancestor != null && ancestor.runtimeType != targetType)
+ ancestor = ancestor.parent;
+ return ancestor;
+ }
+
+ void dependenciesChanged() {
+ // This is called if you've use inheritedOfType and the Inherited
+ // ancestor you were provided was changed. For a widget to use Inherited
+ // it needs an implementation of dependenciesChanged. If your widget extends
+ // Component or RenderObjectWrapper this is provided for you automatically.
+ // If you aren't able to extend one of those classes, you need to
+ // provide your own implementation of dependenciesChanged.
+ assert(false);
+ }
+
void remove() {
- _root = null;
+ _renderObject = null;
setParent(null);
}
@@ -318,7 +339,7 @@
assert(!newNode.mounted);
oldNode.setParent(this);
oldNode._sync(newNode, slot);
- assert(oldNode.root is RenderObject);
+ assert(oldNode.renderObject is RenderObject);
return oldNode;
} else {
oldNode.setParent(null);
@@ -335,7 +356,7 @@
assert(!newNode.mounted);
newNode.setParent(this);
newNode._sync(oldNode, slot);
- assert(newNode.root is RenderObject);
+ assert(newNode.renderObject is RenderObject);
return newNode;
}
@@ -374,15 +395,15 @@
// globalToLocal().
Point globalToLocal(Point point) {
assert(mounted);
- assert(root is RenderBox);
- return (root as RenderBox).globalToLocal(point);
+ assert(renderObject is RenderBox);
+ return (renderObject as RenderBox).globalToLocal(point);
}
// See globalToLocal().
Point localToGlobal(Point point) {
assert(mounted);
- assert(root is RenderBox);
- return (root as RenderBox).localToGlobal(point);
+ assert(renderObject is RenderBox);
+ return (renderObject as RenderBox).localToGlobal(point);
}
}
@@ -410,9 +431,9 @@
Widget oldChild = old == null ? null : (old as TagNode).child;
child = syncChild(child, oldChild, slot);
assert(child.parent == this);
- assert(child.root != null);
- _root = child.root;
- assert(_root == root); // in case a subclass reintroduces it
+ assert(child.renderObject != null);
+ _renderObject = child.renderObject;
+ assert(_renderObject == renderObject); // in case a subclass reintroduces it
}
void updateSlot(dynamic newSlot) {
@@ -453,10 +474,9 @@
void notifyDescendants() {
final Type ourRuntimeType = runtimeType;
void notifyChildren(Widget child) {
- if (child is Component &&
- child._dependencies != null &&
+ if (child._dependencies != null &&
child._dependencies.contains(ourRuntimeType))
- child._dependenciesChanged();
+ child.dependenciesChanged();
if (child.runtimeType != ourRuntimeType)
child.walkChildren(notifyChildren);
}
@@ -596,7 +616,7 @@
void remove() {
assert(_built != null);
- assert(root != null);
+ assert(renderObject != null);
removeChild(_built);
_built = null;
super.remove();
@@ -604,21 +624,11 @@
void detachRoot() {
assert(_built != null);
- assert(root != null);
+ assert(renderObject != null);
_built.detachRoot();
}
- Set<Type> _dependencies;
- Inherited inheritedOfType(Type targetType) {
- if (_dependencies == null)
- _dependencies = new Set<Type>();
- _dependencies.add(targetType);
- Widget ancestor = parent;
- while (ancestor != null && ancestor.runtimeType != targetType)
- ancestor = ancestor.parent;
- return ancestor;
- }
- void _dependenciesChanged() {
+ void dependenciesChanged() {
// called by Inherited.sync()
_scheduleBuild();
}
@@ -664,15 +674,15 @@
_isBuilding = false;
_dirty = false;
- _root = _built.root;
- assert(_root == root); // in case a subclass reintroduces it
- assert(root != null);
+ _renderObject = _built.renderObject;
+ assert(_renderObject == renderObject); // in case a subclass reintroduces it
+ assert(renderObject != null);
}
void _buildIfDirty() {
if (!_dirty || !_mounted)
return;
- assert(root != null);
+ assert(renderObject != null);
_sync(null, _slot);
}
@@ -866,12 +876,23 @@
new HashMap<RenderObject, RenderObjectWrapper>();
static RenderObjectWrapper _getMounted(RenderObject node) => _nodeMap[node];
+ static Iterable<Widget> getWidgetsForRenderObject(RenderObject renderObject) sync* {
+ Widget target = RenderObjectWrapper._getMounted(renderObject);
+ if (target == null)
+ return;
+ RenderObject targetRoot = target.renderObject;
+ while (target != null && target.renderObject == targetRoot) {
+ yield target;
+ target = target.parent;
+ }
+ }
+
RenderObjectWrapper _ancestor;
void insertChildRoot(RenderObjectWrapper child, dynamic slot);
void detachChildRoot(RenderObjectWrapper child);
void retainStatefulRenderObjectWrapper(RenderObjectWrapper newNode) {
- newNode._root = _root;
+ newNode._renderObject = _renderObject;
newNode._ancestor = _ancestor;
}
@@ -881,21 +902,21 @@
// doesn't need.
assert(parent != null || this is RenderViewWrapper);
if (old == null) {
- _root = createNode();
- assert(_root != null);
+ _renderObject = createNode();
+ assert(_renderObject != null);
_ancestor = findAncestorRenderObjectWrapper();
if (_ancestor is RenderObjectWrapper)
_ancestor.insertChildRoot(this, slot);
} else {
assert(old is RenderObjectWrapper);
- _root = old.root;
+ _renderObject = old.renderObject;
_ancestor = old._ancestor;
- assert(_root != null);
+ assert(_renderObject != null);
}
- assert(_root == root); // in case a subclass reintroduces it
- assert(root != null);
+ assert(_renderObject == renderObject); // in case a subclass reintroduces it
+ assert(renderObject != null);
assert(mounted);
- _nodeMap[root] = this;
+ _nodeMap[renderObject] = this;
syncRenderObject(old);
}
@@ -919,22 +940,27 @@
ancestor = ancestor.parent;
}
if (parentData != null) {
- assert(root.parentData != null);
- root.parentData.merge(parentData); // this will throw if the types aren't appropriate
- if (ancestor != null && ancestor.root != null)
- ancestor.root.markNeedsLayout();
+ assert(renderObject.parentData != null);
+ renderObject.parentData.merge(parentData); // this will throw if the types aren't appropriate
+ if (ancestor != null && ancestor.renderObject != null)
+ ancestor.renderObject.markNeedsLayout();
}
}
+ void dependenciesChanged() {
+ // called by Inherited.sync()
+ syncRenderObject(this);
+ }
+
void remove() {
- assert(root != null);
- _nodeMap.remove(root);
+ assert(renderObject != null);
+ _nodeMap.remove(renderObject);
super.remove();
}
void detachRoot() {
assert(_ancestor != null);
- assert(root != null);
+ assert(renderObject != null);
_ancestor.detachChildRoot(this);
}
@@ -977,19 +1003,19 @@
}
void insertChildRoot(RenderObjectWrapper child, dynamic slot) {
- final root = this.root; // TODO(ianh): Remove this once the analyzer is cleverer
- assert(root is RenderObjectWithChildMixin);
+ final renderObject = this.renderObject; // TODO(ianh): Remove this once the analyzer is cleverer
+ assert(renderObject is RenderObjectWithChildMixin);
assert(slot == null);
- root.child = child.root;
- assert(root == this.root); // TODO(ianh): Remove this once the analyzer is cleverer
+ renderObject.child = child.renderObject;
+ assert(renderObject == this.renderObject); // TODO(ianh): Remove this once the analyzer is cleverer
}
void detachChildRoot(RenderObjectWrapper child) {
- final root = this.root; // TODO(ianh): Remove this once the analyzer is cleverer
- assert(root is RenderObjectWithChildMixin);
- assert(root.child == child.root);
- root.child = null;
- assert(root == this.root); // TODO(ianh): Remove this once the analyzer is cleverer
+ final renderObject = this.renderObject; // TODO(ianh): Remove this once the analyzer is cleverer
+ assert(renderObject is RenderObjectWithChildMixin);
+ assert(renderObject.child == child.renderObject);
+ renderObject.child = null;
+ assert(renderObject == this.renderObject); // TODO(ianh): Remove this once the analyzer is cleverer
}
void remove() {
@@ -1018,19 +1044,19 @@
}
void insertChildRoot(RenderObjectWrapper child, dynamic slot) {
- final root = this.root; // TODO(ianh): Remove this once the analyzer is cleverer
+ final renderObject = this.renderObject; // TODO(ianh): Remove this once the analyzer is cleverer
assert(slot == null || slot is RenderObject);
- assert(root is ContainerRenderObjectMixin);
- root.add(child.root, before: slot);
- assert(root == this.root); // TODO(ianh): Remove this once the analyzer is cleverer
+ assert(renderObject is ContainerRenderObjectMixin);
+ renderObject.add(child.renderObject, before: slot);
+ assert(renderObject == this.renderObject); // TODO(ianh): Remove this once the analyzer is cleverer
}
void detachChildRoot(RenderObjectWrapper child) {
- final root = this.root; // TODO(ianh): Remove this once the analyzer is cleverer
- assert(root is ContainerRenderObjectMixin);
- assert(child.root.parent == root);
- root.remove(child.root);
- assert(root == this.root); // TODO(ianh): Remove this once the analyzer is cleverer
+ final renderObject = this.renderObject; // TODO(ianh): Remove this once the analyzer is cleverer
+ assert(renderObject is ContainerRenderObjectMixin);
+ assert(child.renderObject.parent == renderObject);
+ renderObject.remove(child.renderObject);
+ assert(renderObject == this.renderObject); // TODO(ianh): Remove this once the analyzer is cleverer
}
void remove() {
@@ -1059,8 +1085,8 @@
void syncRenderObject(MultiChildRenderObjectWrapper old) {
super.syncRenderObject(old);
- final root = this.root; // TODO(ianh): Remove this once the analyzer is cleverer
- if (root is! ContainerRenderObjectMixin)
+ final renderObject = this.renderObject; // TODO(ianh): Remove this once the analyzer is cleverer
+ if (renderObject is! ContainerRenderObjectMixin)
return;
var startIndex = 0;
@@ -1079,7 +1105,7 @@
assert(children[atIndex] != null);
assert(children[atIndex].parent == this);
if (atIndex > 0)
- children[atIndex-1].updateSlot(children[atIndex].root);
+ children[atIndex-1].updateSlot(children[atIndex].renderObject);
}
// Scan backwards from end of list while nodes can be directly synced
@@ -1095,7 +1121,7 @@
endIndex--;
oldEndIndex--;
sync(endIndex);
- nextSibling = children[endIndex].root;
+ nextSibling = children[endIndex].renderObject;
}
HashMap<Key, Widget> oldNodeIdMap = null;
@@ -1136,28 +1162,28 @@
return false;
oldNodeIdMap[currentNode.key] = null; // mark it reordered
- assert(root is ContainerRenderObjectMixin);
- assert(old.root is ContainerRenderObjectMixin);
- assert(oldNode.root != null);
+ assert(renderObject is ContainerRenderObjectMixin);
+ assert(old.renderObject is ContainerRenderObjectMixin);
+ assert(oldNode.renderObject != null);
- if (old.root == root) {
- root.move(oldNode.root, before: nextSibling);
+ if (old.renderObject == renderObject) {
+ renderObject.move(oldNode.renderObject, before: nextSibling);
} else {
- (old.root as ContainerRenderObjectMixin).remove(oldNode.root); // TODO(ianh): Remove cast once the analyzer is cleverer
- root.add(oldNode.root, before: nextSibling);
+ (old.renderObject as ContainerRenderObjectMixin).remove(oldNode.renderObject); // TODO(ianh): Remove cast once the analyzer is cleverer
+ renderObject.add(oldNode.renderObject, before: nextSibling);
}
return true;
}
// Scan forwards, this time we may re-order;
- nextSibling = root.firstChild;
+ nextSibling = renderObject.firstChild;
while (startIndex < endIndex && oldStartIndex < oldEndIndex) {
currentNode = children[startIndex];
oldNode = oldChildren[oldStartIndex];
if (currentNode.runtimeType == oldNode.runtimeType && currentNode.key == oldNode.key) {
- nextSibling = root.childAfter(nextSibling);
+ nextSibling = renderObject.childAfter(nextSibling);
sync(startIndex);
startIndex++;
advanceOldStartIndex();
@@ -1187,7 +1213,7 @@
advanceOldStartIndex();
}
- assert(root == this.root); // TODO(ianh): Remove this once the analyzer is cleverer
+ assert(renderObject == this.renderObject); // TODO(ianh): Remove this once the analyzer is cleverer
}
}
@@ -1209,11 +1235,7 @@
if (disposition == EventDisposition.consumed)
return EventDisposition.consumed;
for (HitTestEntry entry in result.path.reversed) {
- Widget target = RenderObjectWrapper._getMounted(entry.target);
- if (target == null)
- continue;
- RenderObject targetRoot = target.root;
- while (target != null && target.root == targetRoot) {
+ for (Widget target in RenderObjectWrapper.getWidgetsForRenderObject(entry.target)) {
if (target is Listener) {
EventDisposition targetDisposition = target._handleEvent(event);
if (targetDisposition == EventDisposition.consumed) {
@@ -1286,7 +1308,7 @@
class RenderViewWrapper extends OneChildRenderObjectWrapper {
RenderViewWrapper({ Key key, Widget child }) : super(key: key, child: child);
- RenderView get root => super.root;
+ RenderView get renderObject => super.renderObject;
RenderView createNode() => SkyBinding.instance.renderView;
}
@@ -1330,14 +1352,14 @@
void set container(RenderObjectWithChildMixin<RenderBox> value) {
if (_container != value) {
assert(value.child == null);
- if (root != null) {
- assert(_container.child == root);
+ if (renderObject != null) {
+ assert(_container.child == renderObject);
_container.child = null;
}
_container = value;
- if (root != null) {
- _container.child = root;
- assert(_container.child == root);
+ if (renderObject != null) {
+ _container.child = renderObject;
+ assert(_container.child == renderObject);
}
}
}
@@ -1346,12 +1368,12 @@
void _buildIfDirty() {
super._buildIfDirty();
- if (root.parent == null) {
+ if (renderObject.parent == null) {
// we haven't attached it yet
assert(_container.child == null);
- _container.child = root;
+ _container.child = renderObject;
}
- assert(root.parent == _container);
+ assert(renderObject.parent == _container);
}
Widget build() => builder();
diff --git a/sky/packages/sky/lib/widgets/ink_well.dart b/sky/packages/sky/lib/widgets/ink_well.dart
index 906f781..6d096ae 100644
--- a/sky/packages/sky/lib/widgets/ink_well.dart
+++ b/sky/packages/sky/lib/widgets/ink_well.dart
@@ -131,6 +131,6 @@
InkWell({ Key key, Widget child })
: super(key: key, child: child);
- RenderInkWell get root => super.root;
+ RenderInkWell get renderObject => super.renderObject;
RenderInkWell createNode() => new RenderInkWell();
}
diff --git a/sky/packages/sky/lib/widgets/scaffold.dart b/sky/packages/sky/lib/widgets/scaffold.dart
index 0cc6046..8df48b8 100644
--- a/sky/packages/sky/lib/widgets/scaffold.dart
+++ b/sky/packages/sky/lib/widgets/scaffold.dart
@@ -196,7 +196,7 @@
Map<ScaffoldSlots, Widget> _slots = new Map<ScaffoldSlots, Widget>();
- RenderScaffold get root => super.root;
+ RenderScaffold get renderObject => super.renderObject;
RenderScaffold createNode() => new RenderScaffold();
void walkChildren(WidgetTreeWalker walker) {
@@ -208,15 +208,15 @@
}
void insertChildRoot(RenderObjectWrapper child, ScaffoldSlots slot) {
- root[slot] = child != null ? child.root : null;
+ renderObject[slot] = child != null ? child.renderObject : null;
}
void detachChildRoot(RenderObjectWrapper child) {
- final root = this.root; // TODO(ianh): Remove this once the analyzer is cleverer
- assert(root is RenderScaffold);
- assert(root == child.root.parent);
- root.remove(child.root);
- assert(root == this.root); // TODO(ianh): Remove this once the analyzer is cleverer
+ final renderObject = this.renderObject; // TODO(ianh): Remove this once the analyzer is cleverer
+ assert(renderObject is RenderScaffold);
+ assert(renderObject == child.renderObject.parent);
+ renderObject.remove(child.renderObject);
+ assert(renderObject == this.renderObject); // TODO(ianh): Remove this once the analyzer is cleverer
}
void remove() {
diff --git a/sky/packages/sky/lib/widgets/scrollable.dart b/sky/packages/sky/lib/widgets/scrollable.dart
index 25e02e9..596b7bb 100644
--- a/sky/packages/sky/lib/widgets/scrollable.dart
+++ b/sky/packages/sky/lib/widgets/scrollable.dart
@@ -233,20 +233,20 @@
bool ensureWidgetIsVisible(Widget target, { ValueAnimation<double> animation }) {
assert(target.mounted);
- assert(target.root is RenderBox);
+ assert(target.renderObject is RenderBox);
Scrollable scrollable = findScrollableAncestor(target: target);
if (scrollable == null)
return false;
- Size targetSize = (target.root as RenderBox).size;
+ Size targetSize = (target.renderObject as RenderBox).size;
Point targetCenter = target.localToGlobal(
scrollable.scrollDirection == ScrollDirection.vertical
? new Point(0.0, targetSize.height / 2.0)
: new Point(targetSize.width / 2.0, 0.0)
);
- Size scrollableSize = (scrollable.root as RenderBox).size;
+ Size scrollableSize = (scrollable.renderObject as RenderBox).size;
Point scrollableCenter = scrollable.localToGlobal(
scrollable.scrollDirection == ScrollDirection.vertical
? new Point(0.0, scrollableSize.height / 2.0)
diff --git a/sky/packages/sky/lib/widgets/switch.dart b/sky/packages/sky/lib/widgets/switch.dart
index c6f8521..573716d 100644
--- a/sky/packages/sky/lib/widgets/switch.dart
+++ b/sky/packages/sky/lib/widgets/switch.dart
@@ -30,47 +30,34 @@
const Size _kSwitchSize = const Size(_kSwitchWidth + 2.0, _kSwitchHeight + 2.0);
const double _kReactionRadius = _kSwitchWidth / 2.0;
-class Switch extends Component {
- Switch({Key key, this.value, this.onChanged}) : super(key: key);
-
- final bool value;
- final ValueChanged onChanged;
-
- Widget build() {
- return new _SwitchWrapper(
- value: value,
- onChanged: onChanged,
- thumbColor: Theme.of(this).accentColor);
- }
-}
-
-// This wrapper class exists only because Switch needs to be a Component in
-// order to get an accent color from a Theme but Components do not know how to
-// host RenderObjects.
-class _SwitchWrapper extends LeafRenderObjectWrapper {
- _SwitchWrapper({Key key, this.value, this.onChanged, this.thumbColor})
+class Switch extends LeafRenderObjectWrapper {
+ Switch({ Key key, this.value, this.onChanged })
: super(key: key);
final bool value;
final ValueChanged onChanged;
- final Color thumbColor;
- _RenderSwitch get root => super.root;
+ _RenderSwitch get renderObject => super.renderObject;
_RenderSwitch createNode() => new _RenderSwitch(
- value: value, thumbColor: thumbColor, onChanged: onChanged);
+ value: value,
+ thumbColor: null,
+ onChanged: onChanged
+ );
- void syncRenderObject(_SwitchWrapper old) {
+ void syncRenderObject(Switch old) {
super.syncRenderObject(old);
- root.value = value;
- root.onChanged = onChanged;
- root.thumbColor = thumbColor;
+ renderObject.value = value;
+ renderObject.onChanged = onChanged;
+ renderObject.thumbColor = Theme.of(this).accentColor;
}
}
class _RenderSwitch extends RenderToggleable {
- _RenderSwitch(
- {bool value, Color thumbColor: _kThumbOffColor, ValueChanged onChanged})
- : _thumbColor = thumbColor,
+ _RenderSwitch({
+ bool value,
+ Color thumbColor: _kThumbOffColor,
+ ValueChanged onChanged
+ }) : _thumbColor = thumbColor,
super(value: value, onChanged: onChanged, size: _kSwitchSize) {}
Color _thumbColor;
diff --git a/sky/packages/sky/lib/widgets/tabs.dart b/sky/packages/sky/lib/widgets/tabs.dart
index 00007c3..63a469c 100644
--- a/sky/packages/sky/lib/widgets/tabs.dart
+++ b/sky/packages/sky/lib/widgets/tabs.dart
@@ -287,18 +287,18 @@
final bool isScrollable;
final LayoutChanged onLayoutChanged;
- RenderTabBar get root => super.root;
+ RenderTabBar get renderObject => super.renderObject;
RenderTabBar createNode() => new RenderTabBar(onLayoutChanged);
void syncRenderObject(Widget old) {
super.syncRenderObject(old);
- root.selectedIndex = selectedIndex;
- root.backgroundColor = backgroundColor;
- root.indicatorColor = indicatorColor;
- root.indicatorRect = indicatorRect;
- root.textAndIcons = textAndIcons;
- root.isScrollable = isScrollable;
- root.onLayoutChanged = onLayoutChanged;
+ renderObject.selectedIndex = selectedIndex;
+ renderObject.backgroundColor = backgroundColor;
+ renderObject.indicatorColor = indicatorColor;
+ renderObject.indicatorRect = indicatorRect;
+ renderObject.textAndIcons = textAndIcons;
+ renderObject.isScrollable = isScrollable;
+ renderObject.onLayoutChanged = onLayoutChanged;
}
}
diff --git a/sky/packages/sky/lib/widgets/theme.dart b/sky/packages/sky/lib/widgets/theme.dart
index b84ff16..fb7cad8 100644
--- a/sky/packages/sky/lib/widgets/theme.dart
+++ b/sky/packages/sky/lib/widgets/theme.dart
@@ -23,8 +23,8 @@
static final ThemeData _kFallbackTheme = new ThemeData.fallback();
- static ThemeData of(Component component) {
- Theme theme = component.inheritedOfType(Theme);
+ static ThemeData of(Widget widget) {
+ Theme theme = widget.inheritedOfType(Theme);
return theme == null ? _kFallbackTheme : theme.data;
}
diff --git a/sky/tools/shelldb b/sky/tools/shelldb
index 6283a8c..dd51c64 100755
--- a/sky/tools/shelldb
+++ b/sky/tools/shelldb
@@ -392,39 +392,6 @@
pids.clear()
-class Analyze(object):
- def add_subparser(self, subparsers):
- analyze_parser = subparsers.add_parser('analyze',
- help=('run the dart analyzer with sky url mappings'))
- analyze_parser.add_argument('app_path', type=str)
- analyze_parser.add_argument('--congratulate', action="store_true")
- analyze_parser.set_defaults(func=self.run)
-
- def run(self, args, pids):
- build_dir = pids.get('build_dir')
- if not build_dir:
- logging.fatal("pids file missing build_dir. Try 'start' first.")
- return 2
- analyzer_path = os.path.join(SRC_ROOT, 'sky/tools/skyanalyzer')
- analyzer_args = [
- analyzer_path,
- args.app_path
- ]
- if args.congratulate:
- analyzer_args.append('--congratulate')
- try:
- output = subprocess.check_output(analyzer_args, stderr=subprocess.STDOUT)
- result = 0
- except subprocess.CalledProcessError as e:
- output = e.output
- result = e.returncode
- lines = output.split('\n')
- lines.pop()
- for line in lines:
- print >> sys.stderr, line
- return result
-
-
class StartTracing(object):
def add_subparser(self, subparsers):
start_tracing_parser = subparsers.add_parser('start_tracing',
@@ -480,7 +447,6 @@
SetBuildDir(),
StartSky(),
StopSky(),
- Analyze(),
GDBAttach(),
StartTracing(),
StopTracing(),
diff --git a/sky/tools/skyanalyzer b/sky/tools/skyanalyzer
index 3d4da4b..ce09da5 100755
--- a/sky/tools/skyanalyzer
+++ b/sky/tools/skyanalyzer
@@ -31,9 +31,6 @@
# Ignored because they don't affect Sky code
re.compile(r'\[hint\] When compiled to JS, this test might return true when the left hand side is an int'),
- # TODO: Remove once sdk-extensions are in place
- re.compile(r'^\[error\] Native functions can only be declared in'),
-
# TODO: Fix all the warnings in the mojo packages
re.compile(r'.*dart-pub-cache.*\.mojom\.dart'),
re.compile(r'.*dart-pub-cache.*/mojo-'),
@@ -42,10 +39,6 @@
# TODO: Remove this once Sky no longer generates this warning.
# dartbug.com/22836
re.compile(r'.*cannot both be unnamed'),
-
- # TODO: Remove this once Sky no longer generates this warning.
- # dartbug.com/23606
- re.compile(r'^\[warning] Missing concrete implementation of \'RenderObject.toString\''),
]
def main():
@@ -56,7 +49,7 @@
try:
subprocess.check_output([
- DARTANALYZER, "--package-warnings", args.app_path,
+ DARTANALYZER, "--package-warnings", os.path.abspath(args.app_path),
"--package-root", os.path.join(WORKBENCH, "packages"),
"--fatal-warnings"
], stderr=subprocess.STDOUT, cwd=WORKBENCH)
