firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SliverPadding geometry (#106071)

Browse Source
This commit is contained in:
Kate Lovett
2022-06-16 15:36:05 -05:00
committed by GitHub
parent f67d9b75f5
commit a783e422dd
2 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/flutter/lib/src/rendering/sliver_padding.dart
View File

@@ -119,10 +119,21 @@ abstract class RenderSliverEdgeInsetsPadding extends RenderSliver with RenderObj
final double mainAxisPadding = this.mainAxisPadding;
final double crossAxisPadding = this.crossAxisPadding;
if (child == null) {
final double paintExtent = calculatePaintOffset(
constraints,
from: 0.0,
to: mainAxisPadding,
);
final double cacheExtent = calculateCacheOffset(
constraints,
from: 0.0,
to: mainAxisPadding,
);
geometry = SliverGeometry(
scrollExtent: mainAxisPadding,
paintExtent: math.min(mainAxisPadding, constraints.remainingPaintExtent),
paintExtent: math.min(paintExtent, constraints.remainingPaintExtent),
maxPaintExtent: mainAxisPadding,
cacheExtent: cacheExtent,
);
return;
}

30
packages/flutter/test/widgets/slivers_padding_test.dart
View File

@@ -271,6 +271,34 @@ void main() {
expect(tester.renderObject<RenderBox>(find.text('x')).localToGlobal(Offset.zero), const Offset(0.0, 200.0));
});
testWidgets('SliverPadding with no child reports correct geometry as scroll offset changes', (WidgetTester tester) async {
// Regression test for https://github.com/flutter/flutter/issues/64506
final ScrollController controller = ScrollController();
await tester.pumpWidget(
Directionality(
textDirection: TextDirection.ltr,
child: CustomScrollView(
controller: controller,
slivers: const <Widget>[
SliverPadding(padding: EdgeInsets.all(100.0)),
SliverToBoxAdapter(child: SizedBox(width: 400.0, height: 400.0, child: Text('x'))),
],
),
),
);
expect(tester.renderObject<RenderBox>(find.text('x')).localToGlobal(Offset.zero), const Offset(0.0, 200.0));
expect(
tester.renderObject<RenderSliverPadding>(find.byType(SliverPadding)).geometry!.paintExtent,
200.0,
);
controller.jumpTo(50.0);
await tester.pump();
expect(
tester.renderObject<RenderSliverPadding>(find.byType(SliverPadding)).geometry!.paintExtent,
150.0,
);
});
testWidgets('Viewport+SliverPadding changing padding', (WidgetTester tester) async {
await tester.pumpWidget(
Directionality(
@@ -366,7 +394,7 @@ void main() {
),
),
);
expect(tester.renderObject<RenderSliverPadding>(find.byType(SliverPadding)).afterPadding, 1.0);
expect(tester.renderObject<RenderSliverPadding>(find.byType(SliverPadding, skipOffstage: false)).afterPadding, 1.0);
});
testWidgets('SliverPadding propagates geometry offset corrections', (WidgetTester tester) async {