| OLD | NEW |
| 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 '../fn2.dart'; | 5 import '../fn2.dart'; |
| 6 import '../rendering/flex.dart'; | 6 import '../rendering/flex.dart'; |
| 7 import 'dart:collection'; | 7 import 'dart:collection'; |
| 8 import 'dart:sky' as sky; | 8 import 'dart:sky' as sky; |
| 9 // import 'ink_splash.dart'; | 9 // import 'ink_splash.dart'; |
| 10 import 'scrollable.dart'; | 10 import 'scrollable.dart'; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 // InkWell({ Object key, this.inlineStyle, this.children }) | 21 // InkWell({ Object key, this.inlineStyle, this.children }) |
| 22 // : super(key: key) { | 22 // : super(key: key) { |
| 23 // onDidUnmount(() { | 23 // onDidUnmount(() { |
| 24 // _cancelSplashes(null); | 24 // _cancelSplashes(null); |
| 25 // }); | 25 // }); |
| 26 // } | 26 // } |
| 27 | 27 |
| 28 InkWell({ Object key, this.children }) : super(key: key); | 28 InkWell({ Object key, this.children }) : super(key: key); |
| 29 | 29 |
| 30 UINode build() { | 30 UINode build() { |
| 31 return new FlexContainer(direction: FlexDirection.horizontal, children: chil
dren); | 31 return new FlexContainer( |
| 32 direction: FlexDirection.horizontal, |
| 33 justifyContent: FlexJustifyContent.center, |
| 34 children: children); |
| 32 // List<UINode> childrenIncludingSplashes = []; | 35 // List<UINode> childrenIncludingSplashes = []; |
| 33 | 36 |
| 34 // if (_splashes != null) { | 37 // if (_splashes != null) { |
| 35 // childrenIncludingSplashes.addAll( | 38 // childrenIncludingSplashes.addAll( |
| 36 // _splashes.map((s) => new InkSplash(s.onStyleChanged))); | 39 // _splashes.map((s) => new InkSplash(s.onStyleChanged))); |
| 37 // } | 40 // } |
| 38 | 41 |
| 39 // if (children != null) | 42 // if (children != null) |
| 40 // childrenIncludingSplashes.addAll(children); | 43 // childrenIncludingSplashes.addAll(children); |
| 41 | 44 |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 // void _splashDone(SplashController splash) { | 115 // void _splashDone(SplashController splash) { |
| 113 // if (_splashes == null) | 116 // if (_splashes == null) |
| 114 // return; | 117 // return; |
| 115 // setState(() { | 118 // setState(() { |
| 116 // _splashes.remove(splash); | 119 // _splashes.remove(splash); |
| 117 // if (_splashes.length == 0) | 120 // if (_splashes.length == 0) |
| 118 // _splashes = null; | 121 // _splashes = null; |
| 119 // }); | 122 // }); |
| 120 // } | 123 // } |
| 121 } | 124 } |
| OLD | NEW |