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

Unified Diff: sky/sdk/lib/example/rendering/touch_demo.dart

Issue 1214833004: Split Size into Size and Offset. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/sdk/lib/example/raw/spinning_square.dart ('k') | sky/sdk/lib/example/stocks2/lib/stock_arrow.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/sdk/lib/example/rendering/touch_demo.dart
diff --git a/sky/sdk/lib/example/rendering/touch_demo.dart b/sky/sdk/lib/example/rendering/touch_demo.dart
index 1773526d0f2633f32bd3486f4b068eb7399d0e73..c3a54697f393273d5ebe27b348b9582b93c0e204 100644
--- a/sky/sdk/lib/example/rendering/touch_demo.dart
+++ b/sky/sdk/lib/example/rendering/touch_demo.dart
@@ -2,8 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-import 'dart:math';
-import 'dart:sky';
+import 'dart:sky' as sky;
import 'package:sky/rendering/box.dart';
import 'package:sky/rendering/object.dart';
@@ -24,20 +23,18 @@ List<Color> colors = [
class Dot {
final Paint _paint;
- double x = 0.0;
- double y = 0.0;
+ Point position = Point.origin;
double radius = 0.0;
Dot({ Color color }) : _paint = new Paint()..color = color;
- void update(PointerEvent event) {
- x = event.x;
- y = event.y;
+ void update(sky.PointerEvent event) {
+ position = new Point(event.x, event.y);
radius = 5 + (95 * event.pressure);
}
void paint(RenderCanvas canvas) {
- canvas.drawCircle(x, y, radius, _paint);
+ canvas.drawCircle(position, radius, _paint);
}
}
@@ -46,27 +43,29 @@ class RenderTouchDemo extends RenderBox {
RenderTouchDemo();
- void handleEvent(Event event, BoxHitTestEntry entry) {
- switch (event.type) {
- case 'pointerdown':
- Color color = colors[event.pointer.remainder(colors.length)];
- dots[event.pointer] = new Dot(color: color)..update(event);
- break;
- case 'pointerup':
- dots.remove(event.pointer);
- break;
- case 'pointercancel':
- dots = new Map();
- break;
- case 'pointermove':
- dots[event.pointer].update(event);
- break;
+ void handleEvent(sky.Event event, BoxHitTestEntry entry) {
+ if (event is sky.PointerEvent) {
+ switch (event.type) {
+ case 'pointerdown':
+ Color color = colors[event.pointer.remainder(colors.length)];
+ dots[event.pointer] = new Dot(color: color)..update(event);
+ break;
+ case 'pointerup':
+ dots.remove(event.pointer);
+ break;
+ case 'pointercancel':
+ dots = new Map();
+ break;
+ case 'pointermove':
+ dots[event.pointer].update(event);
+ break;
+ }
}
markNeedsPaint();
}
void performLayout() {
- size = constraints.constrain(Size.infinite);
+ size = constraints.biggest;
}
void paint(RenderCanvas canvas) {
« no previous file with comments | « sky/sdk/lib/example/raw/spinning_square.dart ('k') | sky/sdk/lib/example/stocks2/lib/stock_arrow.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698