diff --git a/sdk/lib/editing2/input.dart b/sdk/lib/editing2/input.dart index c40b67fe618..9b310044493 100644 --- a/sdk/lib/editing2/input.dart +++ b/sdk/lib/editing2/input.dart @@ -86,11 +86,11 @@ class Input extends Component { children.add(new EditableText(value: _editableValue, focused: focused)); - return new EventListenerNode( + return new Listener( // style: _style, // inlineStyle: focused ? _focusedInlineStyle : null, - new Stack(children), - onPointerDown: (sky.Event e) => keyboard.showByRequest() + child: new Stack(children), + onPointerDown: (_) => keyboard.showByRequest() ); } diff --git a/sdk/lib/widgets/basic.dart b/sdk/lib/widgets/basic.dart index 0681eb17ec8..c7c22c16823 100644 --- a/sdk/lib/widgets/basic.dart +++ b/sdk/lib/widgets/basic.dart @@ -15,7 +15,7 @@ import 'widget.dart'; export '../rendering/box.dart' show BoxConstraints, BoxDecoration, Border, BorderSide, EdgeDims; export '../rendering/flex.dart' show FlexDirection, FlexJustifyContent, FlexAlignItems; export '../rendering/object.dart' show Point, Size, Rect, Color, Paint, Path; -export 'widget.dart' show Widget, Component, App, EventListenerNode, ParentDataNode; +export 'widget.dart' show Widget, Component, App, Listener, ParentDataNode; // PAINTING NODES diff --git a/sdk/lib/widgets/button_base.dart b/sdk/lib/widgets/button_base.dart index 82329e0ac6c..e0f88544b70 100644 --- a/sdk/lib/widgets/button_base.dart +++ b/sdk/lib/widgets/button_base.dart @@ -31,8 +31,8 @@ abstract class ButtonBase extends Component { } Widget build() { - return new EventListenerNode( - buildContent(), + return new Listener( + child: buildContent(), onPointerDown: _handlePointerDown, onPointerUp: _handlePointerUp, onPointerCancel: _handlePointerCancel diff --git a/sdk/lib/widgets/dialog.dart b/sdk/lib/widgets/dialog.dart index 36a171aeb22..0686179a7bc 100644 --- a/sdk/lib/widgets/dialog.dart +++ b/sdk/lib/widgets/dialog.dart @@ -36,7 +36,10 @@ class Dialog extends Component { children.add(content); return new Stack([ - new EventListenerNode(mask, onGestureTap: (_) => onDismiss()), + new Listener( + child: mask, + onGestureTap: (_) => onDismiss() + ), new Center( child: new ConstrainedBox( constraints: new BoxConstraints(minWidth: 280.0), diff --git a/sdk/lib/widgets/drawer.dart b/sdk/lib/widgets/drawer.dart index 86182a7167b..11a161ce52e 100644 --- a/sdk/lib/widgets/drawer.dart +++ b/sdk/lib/widgets/drawer.dart @@ -139,8 +139,8 @@ class Drawer extends AnimatedComponent { double scaler = _position / _kWidth + 1; Color maskColor = new Color.fromARGB((0x7F * scaler).floor(), 0, 0, 0); - var mask = new EventListenerNode( - new Container(decoration: new BoxDecoration(backgroundColor: maskColor)), + var mask = new Listener( + child: new Container(decoration: new BoxDecoration(backgroundColor: maskColor)), onGestureTap: controller.handleMaskTap, onGestureFlingStart: controller.handleFlingStart ); @@ -154,8 +154,8 @@ class Drawer extends AnimatedComponent { child: new Block(children) ); - return new EventListenerNode( - new Stack([ mask, content ]), + return new Listener( + child: new Stack([ mask, content ]), onPointerDown: controller.handlePointerDown, onPointerMove: controller.handlePointerMove, onPointerUp: controller.handlePointerUp, diff --git a/sdk/lib/widgets/icon_button.dart b/sdk/lib/widgets/icon_button.dart index 4afd7ab3614..a7ae568a096 100644 --- a/sdk/lib/widgets/icon_button.dart +++ b/sdk/lib/widgets/icon_button.dart @@ -16,8 +16,8 @@ class IconButton extends Component { final GestureEventListener onGestureTap; Widget build() { - return new EventListenerNode( - new Padding( + return new Listener( + child: new Padding( child: new Icon(type: icon, size: 24), padding: const EdgeDims.all(8.0)), onGestureTap: onGestureTap); diff --git a/sdk/lib/widgets/material_button.dart b/sdk/lib/widgets/material_button.dart index 616a2d32eca..965d34d5520 100644 --- a/sdk/lib/widgets/material_button.dart +++ b/sdk/lib/widgets/material_button.dart @@ -41,8 +41,8 @@ abstract class MaterialButton extends ButtonBase { padding: new EdgeDims.symmetric(horizontal: 8.0), child: new Center(child: child) // TODO(ianh): figure out a way to compell the child to have gray text when disabled... ); - return new EventListenerNode( - new Container( + return new Listener( + child: new Container( height: 36.0, constraints: new BoxConstraints(minWidth: 88.0), margin: new EdgeDims.all(8.0), diff --git a/sdk/lib/widgets/menu_item.dart b/sdk/lib/widgets/menu_item.dart index 220cd090ceb..1768a311314 100644 --- a/sdk/lib/widgets/menu_item.dart +++ b/sdk/lib/widgets/menu_item.dart @@ -38,8 +38,8 @@ class MenuItem extends ButtonBase { } Widget buildContent() { - return new EventListenerNode( - new Container( + return new Listener( + child: new Container( child: new InkWell( child: new Flex([ new Padding( diff --git a/sdk/lib/widgets/modal_overlay.dart b/sdk/lib/widgets/modal_overlay.dart index e37d730a100..5ded5facfe2 100644 --- a/sdk/lib/widgets/modal_overlay.dart +++ b/sdk/lib/widgets/modal_overlay.dart @@ -20,8 +20,8 @@ class ModalOverlay extends Component { final GestureEventListener onDismiss; Widget build() { - return new EventListenerNode( - new Stack(children), + return new Listener( + child: new Stack(children), onGestureTap: onDismiss); } diff --git a/sdk/lib/widgets/radio.dart b/sdk/lib/widgets/radio.dart index 36c705db30b..64d14be7ba7 100644 --- a/sdk/lib/widgets/radio.dart +++ b/sdk/lib/widgets/radio.dart @@ -37,8 +37,8 @@ class Radio extends ButtonBase { const double kDiameter = 16.0; const double kOuterRadius = kDiameter / 2; const double kInnerRadius = 5.0; - return new EventListenerNode( - new Container( + return new Listener( + child: new Container( margin: const EdgeDims.symmetric(horizontal: 5.0), width: kDiameter, height: kDiameter, diff --git a/sdk/lib/widgets/scrollable.dart b/sdk/lib/widgets/scrollable.dart index 9cc2d2318a2..68fd4514419 100644 --- a/sdk/lib/widgets/scrollable.dart +++ b/sdk/lib/widgets/scrollable.dart @@ -51,8 +51,8 @@ abstract class Scrollable extends Component { Widget buildContent(); Widget build() { - return new EventListenerNode( - new Material( + return new Listener( + child: new Material( child: buildContent(), edge: MaterialEdge.canvas, color: backgroundColor diff --git a/sdk/lib/widgets/toggleable.dart b/sdk/lib/widgets/toggleable.dart index ae7a53d2e03..2ff09472e67 100644 --- a/sdk/lib/widgets/toggleable.dart +++ b/sdk/lib/widgets/toggleable.dart @@ -58,8 +58,8 @@ abstract class Toggleable extends AnimatedComponent { Curve get curveDown => easeOut; Widget build() { - return new EventListenerNode( - new Container( + return new Listener( + child: new Container( margin: margin, width: size.width, height: size.height, diff --git a/sdk/lib/widgets/widget.dart b/sdk/lib/widgets/widget.dart index f4965ef7fec..2f08741faf0 100644 --- a/sdk/lib/widgets/widget.dart +++ b/sdk/lib/widgets/widget.dart @@ -187,9 +187,10 @@ typedef void GestureEventListener(sky.GestureEvent e); typedef void PointerEventListener(sky.PointerEvent e); typedef void EventListener(sky.Event e); -class EventListenerNode extends TagNode { +class Listener extends TagNode { - EventListenerNode(Widget content, { + Listener({ + Widget child, EventListener onWheel, GestureEventListener onGestureFlingCancel, GestureEventListener onGestureFlingStart, @@ -216,7 +217,7 @@ class EventListenerNode extends TagNode { onPointerUp: onPointerUp, custom: custom ), - super(content); + super(child); final Map listeners; @@ -757,7 +758,7 @@ class WidgetAppView extends AppView { continue; RenderObject targetRoot = target.root; while (target != null && target.root == targetRoot) { - if (target is EventListenerNode) + if (target is EventListener) target._handleEvent(event); target = target._parent; }