DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1942 from HansMuller/dropdown_menu

Browse Source 
Widen the dropdown menu item InkWells

Previously the horizontal padding on each menu item didn't response to taps.

Fixes #1916
This commit is contained in:
Hans Muller 2015-11-04 09:16:44 -08:00
commit 2bc6c7d641
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sky/packages/sky/lib/src/material/dropdown.dart
View File

@ -17,7 +17,7 @@ import 'theme.dart';
const Duration _kMenuDuration = const Duration(milliseconds: 300);
const double _kMenuItemHeight = 48.0;
const double _kMenuHorizontalPadding = 36.0;
const EdgeDims _kMenuHorizontalPadding = const EdgeDims.only(left: 36.0, right: 36.0);
const double _kBaselineOffsetFromBottom = 20.0;
const Border _kDropdownUnderline = const Border(bottom: const BorderSide(color: const Color(0xFFBDBDBD), width: 2.0));
@ -54,7 +54,10 @@ class _DropdownMenu extends StatusTransitionComponent {
performance: route.performance,
opacity: opacity,
child: new InkWell(
child: route.items[itemIndex],
child: new Container(
padding: _kMenuHorizontalPadding,
child: route.items[itemIndex]
),
onTap: () {
Navigator.of(context).pop(route.items[itemIndex].value);
}
@ -91,8 +94,8 @@ class _DropdownMenu extends StatusTransitionComponent {
return new Positioned(
top: menuRect.top - (route.selectedIndex * route.rect.height),
right: menuRect.right - _kMenuHorizontalPadding,
left: menuRect.left - _kMenuHorizontalPadding,
right: menuRect.right,
left: menuRect.left,
child: new Focus(
key: new GlobalObjectKey(route),
child: new FadeTransition(
@ -196,7 +199,7 @@ class DropdownButton<T> extends StatelessComponent {
completer: completer,
items: items,
selectedIndex: selectedIndex,
rect: rect,
rect: _kMenuHorizontalPadding.inflateRect(rect),
level: level
));
completer.future.then((T newValue) {

4
sky/packages/sky/lib/src/painting/box_painter.dart
View File

@ -51,6 +51,10 @@ class EdgeDims {
/// The size that this edge dims would occupy with an empty interior.
Size get collapsedSize => new Size(left + right, top + bottom);
Rect inflateRect(Rect rect) {
return new Rect.fromLTRB(rect.left - left, rect.top - top, rect.right + right, rect.bottom + bottom);
}
EdgeDims operator -(EdgeDims other) {
return new EdgeDims.TRBL(
top - other.top,