@@ -211,10 +211,15 @@ void main() {
211
211
final TestGesture gesture = await tester.startGesture (Offset .zero);
212
212
await gesture.moveBy (const Offset (0.0 , 99.0 ));
213
213
await tester.pump ();
214
- await gesture.moveBy (const Offset (0.0 , - 30.0 ));
214
+ if (debugDefaultTargetPlatformOverride == TargetPlatform .macOS) {
215
+ await gesture.moveBy (const Offset (0.0 , - 3.0 ));
216
+ }
217
+ else {
218
+ await gesture.moveBy (const Offset (0.0 , - 30.0 ));
219
+ }
215
220
await tester.pump ();
216
221
if (debugDefaultTargetPlatformOverride == TargetPlatform .macOS) {
217
- await gesture.moveBy (const Offset (0.0 , 70 .0 ));
222
+ await gesture.moveBy (const Offset (0.0 , 90 .0 ));
218
223
}
219
224
else {
220
225
await gesture.moveBy (const Offset (0.0 , 50.0 ));
@@ -230,7 +235,7 @@ void main() {
230
235
),
231
236
if (debugDefaultTargetPlatformOverride == TargetPlatform .macOS) matchesBuilder (
232
237
refreshState: RefreshIndicatorMode .drag,
233
- pulledExtent: moreOrLessEquals (97.3552275 ),
238
+ pulledExtent: moreOrLessEquals (96 ),
234
239
refreshTriggerPullDistance: 100 , // default value.
235
240
refreshIndicatorExtent: 60 , // default value.
236
241
)
@@ -242,7 +247,7 @@ void main() {
242
247
),
243
248
if (debugDefaultTargetPlatformOverride == TargetPlatform .macOS) matchesBuilder (
244
249
refreshState: RefreshIndicatorMode .armed,
245
- pulledExtent: moreOrLessEquals (100.79409877743257 ),
250
+ pulledExtent: moreOrLessEquals (100.44528 ),
246
251
refreshTriggerPullDistance: 100 , // default value.
247
252
refreshIndicatorExtent: 60 , // default value.
248
253
)
@@ -460,7 +465,7 @@ void main() {
460
465
);
461
466
462
467
if (debugDefaultTargetPlatformOverride == TargetPlatform .macOS) {
463
- await tester.drag (find.text ('0' ), const Offset (0.0 , - 600 .0 ), touchSlopY: 0 , warnIfMissed: false ); // hits the list
468
+ await tester.drag (find.text ('0' ), const Offset (0.0 , - 130 .0 ), touchSlopY: 0 , warnIfMissed: false ); // hits the list
464
469
}
465
470
else {
466
471
await tester.drag (find.text ('0' ), const Offset (0.0 , - 300.0 ), touchSlopY: 0 , warnIfMissed: false ); // hits the list
@@ -479,15 +484,15 @@ void main() {
479
484
if (debugDefaultTargetPlatformOverride == TargetPlatform .macOS) {
480
485
expect (
481
486
tester.getTopLeft (find.widgetWithText (Center , '-1' , skipOffstage: false )).dy,
482
- moreOrLessEquals (- 38.625 ),
487
+ moreOrLessEquals (- 40 ),
483
488
);
484
489
expect (
485
490
tester.getBottomLeft (find.widgetWithText (Center , '-1' , skipOffstage: false )).dy,
486
- moreOrLessEquals (21.375 ),
491
+ moreOrLessEquals (20 ),
487
492
);
488
493
expect (
489
494
tester.getTopLeft (find.widgetWithText (Center , '0' )).dy,
490
- moreOrLessEquals (21.375 ),
495
+ moreOrLessEquals (20 ),
491
496
);
492
497
}
493
498
else {
@@ -1195,7 +1200,7 @@ void main() {
1195
1200
);
1196
1201
1197
1202
if (debugDefaultTargetPlatformOverride == TargetPlatform .macOS) {
1198
- await gesture.moveBy (const Offset (0.0 , - 310 .0 )); // Overscrolling, need to move more than -40.
1203
+ await gesture.moveBy (const Offset (0.0 , - 41 .0 )); // Overscrolling, need to move more than -40.
1199
1204
}
1200
1205
else {
1201
1206
await gesture.moveBy (const Offset (0.0 , - 80.0 )); // Overscrolling, need to move more than -40.
@@ -1204,7 +1209,7 @@ void main() {
1204
1209
if (debugDefaultTargetPlatformOverride == TargetPlatform .macOS) {
1205
1210
expect (
1206
1211
tester.getTopLeft (find.widgetWithText (SizedBox , '0' )).dy,
1207
- moreOrLessEquals (49.469222222222214 ), // Below 50 now.
1212
+ moreOrLessEquals (49 ), // Below 50 now.
1208
1213
);
1209
1214
}
1210
1215
else {
@@ -1303,7 +1308,7 @@ void main() {
1303
1308
1304
1309
// Now back in overscroll mode.
1305
1310
if (debugDefaultTargetPlatformOverride == TargetPlatform .macOS) {
1306
- await gesture.moveBy (const Offset (0.0 , - 590 .0 ));
1311
+ await gesture.moveBy (const Offset (0.0 , - 125 .0 ));
1307
1312
}
1308
1313
else {
1309
1314
await gesture.moveBy (const Offset (0.0 , - 200.0 ));
@@ -1312,7 +1317,7 @@ void main() {
1312
1317
if (debugDefaultTargetPlatformOverride == TargetPlatform .macOS) {
1313
1318
expect (
1314
1319
tester.getTopLeft (find.widgetWithText (SizedBox , '0' )).dy,
1315
- moreOrLessEquals (25.916444444444423 ),
1320
+ moreOrLessEquals (25 ),
1316
1321
);
1317
1322
}
1318
1323
else {
@@ -1328,7 +1333,7 @@ void main() {
1328
1333
);
1329
1334
1330
1335
if (debugDefaultTargetPlatformOverride == TargetPlatform .macOS) {
1331
- await gesture.moveBy (const Offset (0.0 , - 160 .0 ));
1336
+ await gesture.moveBy (const Offset (0.0 , - 15 .0 ));
1332
1337
}
1333
1338
else {
1334
1339
await gesture.moveBy (const Offset (0.0 , - 35.0 ));
@@ -1337,7 +1342,7 @@ void main() {
1337
1342
if (debugDefaultTargetPlatformOverride == TargetPlatform .macOS) {
1338
1343
expect (
1339
1344
tester.getTopLeft (find.widgetWithText (SizedBox , '0' )).dy,
1340
- moreOrLessEquals (9.15133037440173 ),
1345
+ moreOrLessEquals (10 ),
1341
1346
);
1342
1347
}
1343
1348
else {
@@ -1380,13 +1385,10 @@ void main() {
1380
1385
);
1381
1386
await tester.pump (); // Sliver scroll offset correction is applied one frame later.
1382
1387
1388
+ await gesture.moveBy (const Offset (0.0 , - 300.0 ));
1383
1389
double indicatorDestinationPosition = - 145.0332383665717 ;
1384
1390
if (debugDefaultTargetPlatformOverride == TargetPlatform .macOS) {
1385
- await gesture.moveBy (const Offset (0.0 , - 600.0 ));
1386
- indicatorDestinationPosition = - 164.33475946989466 ;
1387
- }
1388
- else {
1389
- await gesture.moveBy (const Offset (0.0 , - 300.0 ));
1391
+ indicatorDestinationPosition = - 150.0 ;
1390
1392
}
1391
1393
await tester.pump ();
1392
1394
// The refresh indicator is offscreen now.
0 commit comments