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

Unified Diff: sky/sdk/lib/framework/components2/ink_well.dart

Issue 1165983002: Stub out InkWell and implement Sky’s fn2 menu item (Closed) Base URL: git@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
Index: sky/sdk/lib/framework/components2/ink_well.dart
diff --git a/sky/sdk/lib/framework/components2/ink_well.dart b/sky/sdk/lib/framework/components2/ink_well.dart
index fac4d5fbd1b751f323a6edb9d47b3e6511a3b462..46606fd9f49dcfdad7a16b62703f3f8f90a07005 100644
--- a/sky/sdk/lib/framework/components2/ink_well.dart
+++ b/sky/sdk/lib/framework/components2/ink_well.dart
@@ -3,116 +3,119 @@
// found in the LICENSE file.
import '../fn2.dart';
+import '../rendering/flex.dart';
import 'dart:collection';
import 'dart:sky' as sky;
-import 'ink_splash.dart';
+// import 'ink_splash.dart';
import 'scrollable.dart';
class InkWell extends Component implements ScrollClient {
- static final Style _containmentStyleHack = new Style('''
- align-items: center;
- transform: translateX(0);''');
+ // static final Style _containmentStyleHack = new Style('''
+ // align-items: center;
+ // transform: translateX(0);''');
- LinkedHashSet<SplashController> _splashes;
+ // LinkedHashSet<SplashController> _splashes;
- String inlineStyle;
List<UINode> children;
- InkWell({ Object key, this.inlineStyle, this.children })
- : super(key: key) {
- onDidUnmount(() {
- _cancelSplashes(null);
- });
- }
-
- UINode build() {
- List<UINode> childrenIncludingSplashes = [];
-
- if (_splashes != null) {
- childrenIncludingSplashes.addAll(
- _splashes.map((s) => new InkSplash(s.onStyleChanged)));
- }
-
- if (children != null)
- childrenIncludingSplashes.addAll(children);
-
- return new EventListenerNode(
- new FlexContainer(
- direction: FlexDirection.Row,
- style: _containmentStyleHack,
- inlineStyle: inlineStyle,
- children: childrenIncludingSplashes),
- onGestureTapDown: _startSplash,
- onGestureTap: _confirmSplash
- );
- }
+ // InkWell({ Object key, this.inlineStyle, this.children })
+ // : super(key: key) {
+ // onDidUnmount(() {
+ // _cancelSplashes(null);
+ // });
+ // }
- void _startSplash(sky.GestureEvent event) {
- setState(() {
- if (_splashes == null)
- _splashes = new LinkedHashSet<SplashController>();
- var splash;
- var root = getRoot();
- splash = new SplashController(root.rect, event.x, event.y,
- pointer: event.primaryPointer,
- onDone: () { _splashDone(splash); });
- _splashes.add(splash);
- UINode node = parent;
- while (node != null) {
- if (node is Scrollable)
- node.registerScrollClient(this);
- node = node.parent;
- }
- });
- }
-
- bool ancestorScrolled(Scrollable ancestor) {
- _abortSplashes();
- return false;
- }
+ InkWell({ Object key, this.children }) : super(key: key);
- void handleRemoved() {
- UINode node = parent;
- while (node != null) {
- if (node is Scrollable)
- node.unregisterScrollClient(this);
- node = node.parent;
- }
- super.handleRemoved();
- }
-
- void _confirmSplash(sky.GestureEvent event) {
- if (_splashes == null)
- return;
- _splashes.where((splash) => splash.pointer == event.primaryPointer)
- .forEach((splash) { splash.confirm(); });
- }
-
- void _abortSplashes() {
- if (_splashes == null)
- return;
- setState(() {
- _splashes.forEach((s) { s.abort(); });
- });
- }
-
- void _cancelSplashes(sky.Event event) {
- if (_splashes == null)
- return;
- setState(() {
- var splashes = _splashes;
- _splashes = null;
- splashes.forEach((s) { s.cancel(); });
- });
+ UINode build() {
+ return new FlexContainer(direction: FlexDirection.Horizontal, children: children);
+ // List<UINode> childrenIncludingSplashes = [];
+
+ // if (_splashes != null) {
+ // childrenIncludingSplashes.addAll(
+ // _splashes.map((s) => new InkSplash(s.onStyleChanged)));
+ // }
+
+ // if (children != null)
+ // childrenIncludingSplashes.addAll(children);
+
+ // return new EventListenerNode(
+ // new FlexContainer(
+ // direction: FlexDirection.Row,
+ // style: _containmentStyleHack,
+ // inlineStyle: inlineStyle,
+ // children: childrenIncludingSplashes),
+ // onGestureTapDown: _startSplash,
+ // onGestureTap: _confirmSplash
+ // );
}
- void _splashDone(SplashController splash) {
- if (_splashes == null)
- return;
- setState(() {
- _splashes.remove(splash);
- if (_splashes.length == 0)
- _splashes = null;
- });
- }
+ // void _startSplash(sky.GestureEvent event) {
+ // setState(() {
+ // if (_splashes == null)
+ // _splashes = new LinkedHashSet<SplashController>();
+ // var splash;
+ // var root = getRoot();
+ // splash = new SplashController(root.rect, event.x, event.y,
+ // pointer: event.primaryPointer,
+ // onDone: () { _splashDone(splash); });
+ // _splashes.add(splash);
+ // UINode node = parent;
+ // while (node != null) {
+ // if (node is Scrollable)
+ // node.registerScrollClient(this);
+ // node = node.parent;
+ // }
+ // });
+ // }
+
+ // bool ancestorScrolled(Scrollable ancestor) {
+ // _abortSplashes();
+ // return false;
+ // }
+
+ // void handleRemoved() {
+ // UINode node = parent;
+ // while (node != null) {
+ // if (node is Scrollable)
+ // node.unregisterScrollClient(this);
+ // node = node.parent;
+ // }
+ // super.handleRemoved();
+ // }
+
+ // void _confirmSplash(sky.GestureEvent event) {
+ // if (_splashes == null)
+ // return;
+ // _splashes.where((splash) => splash.pointer == event.primaryPointer)
+ // .forEach((splash) { splash.confirm(); });
+ // }
+
+ // void _abortSplashes() {
+ // if (_splashes == null)
+ // return;
+ // setState(() {
+ // _splashes.forEach((s) { s.abort(); });
+ // });
+ // }
+
+ // void _cancelSplashes(sky.Event event) {
+ // if (_splashes == null)
+ // return;
+ // setState(() {
+ // var splashes = _splashes;
+ // _splashes = null;
+ // splashes.forEach((s) { s.cancel(); });
+ // });
+ // }
+
+ // void _splashDone(SplashController splash) {
+ // if (_splashes == null)
+ // return;
+ // setState(() {
+ // _splashes.remove(splash);
+ // if (_splashes.length == 0)
+ // _splashes = null;
+ // });
+ // }
}

Powered by Google App Engine
This is Rietveld 408576698