| 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 'basic.dart'; | 5 import 'basic.dart'; |
| 6 import 'button_base.dart'; | 6 import 'button_base.dart'; |
| 7 import 'icon.dart'; | 7 import 'icon.dart'; |
| 8 import 'ink_well.dart'; | 8 import 'ink_well.dart'; |
| 9 import 'ui_node.dart'; | 9 import 'ui_node.dart'; |
| 10 | 10 |
| 11 const BoxDecoration _kHighlightDecoration = const BoxDecoration( | 11 const BoxDecoration _kHighlightDecoration = const BoxDecoration( |
| 12 backgroundColor: const Color.fromARGB(102, 153, 153, 153) | 12 backgroundColor: const Color.fromARGB(102, 153, 153, 153) |
| 13 ); | 13 ); |
| 14 | 14 |
| 15 // TODO(abarth): We shouldn't need _kHighlightBoring, but currently Container | 15 // TODO(abarth): We shouldn't need _kHighlightBoring, but currently Container |
| 16 // isn't smart enough to retain the components it builds when we | 16 // isn't smart enough to retain the components it builds when we |
| 17 // add or remove a |decoration|. For now, we use a transparent | 17 // add or remove a |decoration|. For now, we use a transparent |
| 18 // decoration to avoid changing the structure of the tree. The | 18 // decoration to avoid changing the structure of the tree. The |
| 19 // right fix, however, is to make Container smarter about how it | 19 // right fix, however, is to make Container smarter about how it |
| 20 // syncs its subcomponents. | 20 // syncs its subcomponents. |
| 21 const BoxDecoration _kHighlightBoring = const BoxDecoration( | 21 const BoxDecoration _kHighlightBoring = const BoxDecoration( |
| 22 backgroundColor: const Color.fromARGB(0, 0, 0, 0) | 22 backgroundColor: const Color.fromARGB(0, 0, 0, 0) |
| 23 ); | 23 ); |
| 24 | 24 |
| 25 class MenuItem extends ButtonBase { | 25 class MenuItem extends ButtonBase { |
| 26 MenuItem({ Object key, this.icon, this.children, this.onGestureTap }) : super(
key: key); | 26 MenuItem({ String key, this.icon, this.children, this.onGestureTap }) |
| 27 : super(key: key); |
| 27 | 28 |
| 28 String icon; | 29 String icon; |
| 29 List<UINode> children; | 30 List<UINode> children; |
| 30 GestureEventListener onGestureTap; | 31 GestureEventListener onGestureTap; |
| 31 | 32 |
| 32 void syncFields(MenuItem source) { | 33 void syncFields(MenuItem source) { |
| 33 icon = source.icon; | 34 icon = source.icon; |
| 34 children = source.children; | 35 children = source.children; |
| 35 onGestureTap = source.onGestureTap; | 36 onGestureTap = source.onGestureTap; |
| 36 super.syncFields(source); | 37 super.syncFields(source); |
| (...skipping 17 matching lines...) Expand all Loading... |
| 54 ) | 55 ) |
| 55 ]) | 56 ]) |
| 56 ), | 57 ), |
| 57 height: 48.0, | 58 height: 48.0, |
| 58 decoration: highlight ? _kHighlightDecoration : _kHighlightBoring | 59 decoration: highlight ? _kHighlightDecoration : _kHighlightBoring |
| 59 ), | 60 ), |
| 60 onGestureTap: onGestureTap | 61 onGestureTap: onGestureTap |
| 61 ); | 62 ); |
| 62 } | 63 } |
| 63 } | 64 } |
| OLD | NEW |