| 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 'animated_component.dart'; | 5 import 'animated_component.dart'; |
| 6 import '../animation/animated_value.dart'; | 6 import '../animation/animated_value.dart'; |
| 7 import '../animation/curves.dart'; | 7 import '../animation/curves.dart'; |
| 8 import '../fn.dart'; | 8 import '../fn.dart'; |
| 9 import '../theme/colors.dart'; | 9 import '../theme/colors.dart'; |
| 10 import '../theme/shadows.dart'; | 10 import '../theme/shadows.dart'; |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 var mask = new EventTarget( | 127 var mask = new EventTarget( |
| 128 new Container( | 128 new Container( |
| 129 key: 'Mask', | 129 key: 'Mask', |
| 130 style: _maskStyle, | 130 style: _maskStyle, |
| 131 inlineStyle: maskInlineStyle | 131 inlineStyle: maskInlineStyle |
| 132 ), | 132 ), |
| 133 onGestureTap: controller.handleMaskTap, | 133 onGestureTap: controller.handleMaskTap, |
| 134 onGestureFlingStart: controller.handleFlingStart | 134 onGestureFlingStart: controller.handleFlingStart |
| 135 ); | 135 ); |
| 136 | 136 |
| 137 Material content = new Material( | 137 Node content = new StyleNode( |
| 138 key: 'Content', | 138 new Material( |
| 139 style: _contentStyle, | 139 key: 'Content', |
| 140 inlineStyle: contentInlineStyle, | 140 inlineStyle: contentInlineStyle, |
| 141 children: children, | 141 children: children, |
| 142 level: level | 142 level: level), |
| 143 ); | 143 _contentStyle); |
| 144 | 144 |
| 145 return new EventTarget( | 145 return new EventTarget( |
| 146 new Container( | 146 new Container( |
| 147 style: _style, | 147 style: _style, |
| 148 inlineStyle: inlineStyle, | 148 inlineStyle: inlineStyle, |
| 149 children: [ mask, content ] | 149 children: [ mask, content ] |
| 150 ), | 150 ), |
| 151 onPointerDown: controller.handlePointerDown, | 151 onPointerDown: controller.handlePointerDown, |
| 152 onPointerMove: controller.handlePointerMove, | 152 onPointerMove: controller.handlePointerMove, |
| 153 onPointerUp: controller.handlePointerUp, | 153 onPointerUp: controller.handlePointerUp, |
| 154 onPointerCancel: controller.handlePointerCancel | 154 onPointerCancel: controller.handlePointerCancel |
| 155 ); | 155 ); |
| 156 } | 156 } |
| 157 } | 157 } |
| OLD | NEW |