| 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 '../painting/text_style.dart'; | 5 import 'package:sky/painting/text_style.dart'; |
| 6 import 'basic.dart'; | 6 import 'package:sky/widgets/basic.dart'; |
| 7 import 'button_base.dart'; | 7 import 'package:sky/widgets/button_base.dart'; |
| 8 import 'default_text_style.dart'; | 8 import 'package:sky/widgets/default_text_style.dart'; |
| 9 import 'icon.dart'; | 9 import 'package:sky/widgets/icon.dart'; |
| 10 import 'ink_well.dart'; | 10 import 'package:sky/widgets/ink_well.dart'; |
| 11 import 'theme.dart'; | 11 import 'package:sky/widgets/theme.dart'; |
| 12 import 'widget.dart'; | 12 import 'package:sky/widgets/widget.dart'; |
| 13 | 13 |
| 14 const BoxDecoration _kHighlightDecoration = const BoxDecoration( | 14 const BoxDecoration _kHighlightDecoration = const BoxDecoration( |
| 15 backgroundColor: const Color.fromARGB(102, 153, 153, 153) | 15 backgroundColor: const Color.fromARGB(102, 153, 153, 153) |
| 16 ); | 16 ); |
| 17 | 17 |
| 18 // TODO(abarth): We shouldn't need _kHighlightBoring, but currently Container | 18 // TODO(abarth): We shouldn't need _kHighlightBoring, but currently Container |
| 19 // isn't smart enough to retain the components it builds when we | 19 // isn't smart enough to retain the components it builds when we |
| 20 // add or remove a |decoration|. For now, we use a transparent | 20 // add or remove a |decoration|. For now, we use a transparent |
| 21 // decoration to avoid changing the structure of the tree. The | 21 // decoration to avoid changing the structure of the tree. The |
| 22 // right fix, however, is to make Container smarter about how it | 22 // right fix, however, is to make Container smarter about how it |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 child: new Container( | 84 child: new Container( |
| 85 decoration: highlight ? _kHighlightDecoration : _kHighlightBoring, | 85 decoration: highlight ? _kHighlightDecoration : _kHighlightBoring, |
| 86 child: new InkWell( | 86 child: new InkWell( |
| 87 child: new Flex(flexChildren) | 87 child: new Flex(flexChildren) |
| 88 ) | 88 ) |
| 89 ) | 89 ) |
| 90 ) | 90 ) |
| 91 ); | 91 ); |
| 92 } | 92 } |
| 93 } | 93 } |
| OLD | NEW |