Skip to content

F
Front-End
Commit 0dafe1a4 authored by Adam Barth's avatar Adam Barth
Browse files
Options

Add dartdoc to Tooltip (#3957) 

Also, remove several unused configuration options and fix an animation
leak.
parent 0e8e8bbb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 139 deletions
packages/flutter/test/material/tooltip_test.dart
View file @ 0dafe1a4
...@@ -43,10 +43,7 @@ void main() { ...@@ -43,10 +43,7 @@ void main() {
height: 20.0, height: 20.0,
padding: const EdgeInsets.all(5.0), padding: const EdgeInsets.all(5.0),
verticalOffset: 20.0, verticalOffset: 20.0,
screenEdgeMargin: const EdgeInsets.all(10.0),
preferBelow: false, preferBelow: false,
fadeDuration: const Duration(seconds: 1),
showDuration: const Duration(seconds: 2),
child: new Container( child: new Container(
width: 0.0, width: 0.0,
height: 0.0 height: 0.0
...@@ -94,10 +91,7 @@ void main() { ...@@ -94,10 +91,7 @@ void main() {
height: 20.0, height: 20.0,
padding: const EdgeInsets.all(5.0), padding: const EdgeInsets.all(5.0),
verticalOffset: 20.0, verticalOffset: 20.0,
screenEdgeMargin: const EdgeInsets.all(10.0),
preferBelow: false, preferBelow: false,
fadeDuration: const Duration(seconds: 1),
showDuration: const Duration(seconds: 2),
child: new Container( child: new Container(
width: 0.0, width: 0.0,
height: 0.0 height: 0.0
...@@ -146,10 +140,7 @@ void main() { ...@@ -146,10 +140,7 @@ void main() {
height: 100.0, height: 100.0,
padding: const EdgeInsets.all(0.0), padding: const EdgeInsets.all(0.0),
verticalOffset: 100.0, verticalOffset: 100.0,
screenEdgeMargin: const EdgeInsets.all(100.0),
preferBelow: false, preferBelow: false,
fadeDuration: const Duration(seconds: 1),
showDuration: const Duration(seconds: 2),
child: new Container( child: new Container(
width: 0.0, width: 0.0,
height: 0.0 height: 0.0
...@@ -167,7 +158,7 @@ void main() { ...@@ -167,7 +158,7 @@ void main() {
await tester.pump(const Duration(seconds: 2)); // faded in, show timer started (and at 0.0) await tester.pump(const Duration(seconds: 2)); // faded in, show timer started (and at 0.0)
/********************* 800x600 screen /********************* 800x600 screen
* ___ * }-100.0 margin * ___ * }- 10.0 margin
* |___| * }-100.0 height * |___| * }-100.0 height
* | * }-100.0 vertical offset * | * }-100.0 vertical offset
* o * y=300.0 * o * y=300.0
...@@ -197,13 +188,10 @@ void main() { ...@@ -197,13 +188,10 @@ void main() {
child: new Tooltip( child: new Tooltip(
key: key, key: key,
message: 'TIP', message: 'TIP',
height: 100.0, height: 190.0,
padding: const EdgeInsets.all(0.0), padding: const EdgeInsets.all(0.0),
verticalOffset: 100.0, verticalOffset: 100.0,
screenEdgeMargin: const EdgeInsets.all(100.0),
preferBelow: false, preferBelow: false,
fadeDuration: const Duration(seconds: 1),
showDuration: const Duration(seconds: 2),
child: new Container( child: new Container(
width: 0.0, width: 0.0,
height: 0.0 height: 0.0
...@@ -222,8 +210,8 @@ void main() { ...@@ -222,8 +210,8 @@ void main() {
// we try to put it here but it doesn't fit: // we try to put it here but it doesn't fit:
/********************* 800x600 screen /********************* 800x600 screen
* ___ * }-100.0 margin * ___ * }- 10.0 margin
* |___| * }-100.0 height (starts at y=99.0) * |___| * }-190.0 height (starts at y=9.0)
* | * }-100.0 vertical offset * | * }-100.0 vertical offset
* o * y=299.0 * o * y=299.0
* * * *
...@@ -237,14 +225,14 @@ void main() { ...@@ -237,14 +225,14 @@ void main() {
* * * *
* o * y=299.0 * o * y=299.0
* _|_ * }-100.0 vertical offset * _|_ * }-100.0 vertical offset
* |___| * }-100.0 height * |___| * }-190.0 height
* * }-100.0 margin * * }- 10.0 margin
*********************/ *********************/
RenderBox tip = tester.renderObject(find.text('TIP')).parent; RenderBox tip = tester.renderObject(find.text('TIP')).parent;
expect(tip.size.height, equals(100.0)); expect(tip.size.height, equals(190.0));
expect(tip.localToGlobal(tip.size.topLeft(Point.origin)).y, equals(399.0)); expect(tip.localToGlobal(tip.size.topLeft(Point.origin)).y, equals(399.0));
expect(tip.localToGlobal(tip.size.bottomRight(Point.origin)).y, equals(499.0)); expect(tip.localToGlobal(tip.size.bottomRight(Point.origin)).y, equals(589.0));
}); });
testWidgets('Does tooltip end up in the right place - center prefer below fits', (WidgetTester tester) async { testWidgets('Does tooltip end up in the right place - center prefer below fits', (WidgetTester tester) async {
...@@ -262,13 +250,10 @@ void main() { ...@@ -262,13 +250,10 @@ void main() {
child: new Tooltip( child: new Tooltip(
key: key, key: key,
message: 'TIP', message: 'TIP',
height: 100.0, height: 190.0,
padding: const EdgeInsets.all(0.0), padding: const EdgeInsets.all(0.0),
verticalOffset: 100.0, verticalOffset: 100.0,
screenEdgeMargin: const EdgeInsets.all(100.0),
preferBelow: true, preferBelow: true,
fadeDuration: const Duration(seconds: 1),
showDuration: const Duration(seconds: 2),
child: new Container( child: new Container(
width: 0.0, width: 0.0,
height: 0.0 height: 0.0
...@@ -290,14 +275,14 @@ void main() { ...@@ -290,14 +275,14 @@ void main() {
* * * *
* o * y=300.0 * o * y=300.0
* _|_ * }-100.0 vertical offset * _|_ * }-100.0 vertical offset
* |___| * }-100.0 height * |___| * }-190.0 height
* * }-100.0 margin * * }- 10.0 margin
*********************/ *********************/
RenderBox tip = tester.renderObject(find.text('TIP')).parent; RenderBox tip = tester.renderObject(find.text('TIP')).parent;
expect(tip.size.height, equals(100.0)); expect(tip.size.height, equals(190.0));
expect(tip.localToGlobal(tip.size.topLeft(Point.origin)).y, equals(400.0)); expect(tip.localToGlobal(tip.size.topLeft(Point.origin)).y, equals(400.0));
expect(tip.localToGlobal(tip.size.bottomRight(Point.origin)).y, equals(500.0)); expect(tip.localToGlobal(tip.size.bottomRight(Point.origin)).y, equals(590.0));
}); });
testWidgets('Does tooltip end up in the right place - way off to the right', (WidgetTester tester) async { testWidgets('Does tooltip end up in the right place - way off to the right', (WidgetTester tester) async {
...@@ -318,10 +303,7 @@ void main() { ...@@ -318,10 +303,7 @@ void main() {
height: 10.0, height: 10.0,
padding: const EdgeInsets.all(0.0), padding: const EdgeInsets.all(0.0),
verticalOffset: 10.0, verticalOffset: 10.0,
screenEdgeMargin: const EdgeInsets.all(10.0),
preferBelow: true, preferBelow: true,
fadeDuration: const Duration(seconds: 1),
showDuration: const Duration(seconds: 2),
child: new Container( child: new Container(
width: 0.0, width: 0.0,
height: 0.0 height: 0.0
...@@ -373,10 +355,7 @@ void main() { ...@@ -373,10 +355,7 @@ void main() {
height: 10.0, height: 10.0,
padding: const EdgeInsets.all(0.0), padding: const EdgeInsets.all(0.0),
verticalOffset: 10.0, verticalOffset: 10.0,
screenEdgeMargin: const EdgeInsets.all(10.0),
preferBelow: true, preferBelow: true,
fadeDuration: const Duration(seconds: 1),
showDuration: const Duration(seconds: 2),
child: new Container( child: new Container(
width: 0.0, width: 0.0,
height: 0.0 height: 0.0
...@@ -426,8 +405,6 @@ void main() { ...@@ -426,8 +405,6 @@ void main() {
child: new Tooltip( child: new Tooltip(
key: key, key: key,
message: 'TIP', message: 'TIP',
fadeDuration: const Duration(seconds: 1),
showDuration: const Duration(seconds: 2),
child: new Container(width: 0.0, height: 0.0) child: new Container(width: 0.0, height: 0.0)
) )
), ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab