Skip to content

Commit 3fdd6ee

Browse files
authored
Reland "Overlay always applies clip (#113770)" (#116674)
* Reland "Overlay always applies clip (#113770)" This reverts commit d0afbd7. * Root navigator will not clip
1 parent 1546fa0 commit 3fdd6ee

File tree

4 files changed

+28
-8
lines changed

4 files changed

+28
-8
lines changed

packages/flutter/lib/src/widgets/app.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1623,6 +1623,7 @@ class _WidgetsAppState extends State<WidgetsApp> with WidgetsBindingObserver {
16231623
debugLabel: 'Navigator Scope',
16241624
autofocus: true,
16251625
child: Navigator(
1626+
clipBehavior: Clip.none,
16261627
restorationScopeId: 'nav',
16271628
key: _navigator,
16281629
initialRoute: _initialRouteName,

packages/flutter/lib/src/widgets/overlay.dart

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -702,8 +702,6 @@ class _RenderTheatre extends RenderBox with ContainerRenderObjectMixin<RenderBox
702702
addAll(children);
703703
}
704704

705-
bool _hasVisualOverflow = false;
706-
707705
@override
708706
void setupParentData(RenderBox child) {
709707
if (child.parentData is! StackParentData) {
@@ -827,8 +825,6 @@ class _RenderTheatre extends RenderBox with ContainerRenderObjectMixin<RenderBox
827825

828826
@override
829827
void performLayout() {
830-
_hasVisualOverflow = false;
831-
832828
if (_onstageChildCount == 0) {
833829
return;
834830
}
@@ -847,7 +843,7 @@ class _RenderTheatre extends RenderBox with ContainerRenderObjectMixin<RenderBox
847843
child.layout(nonPositionedConstraints, parentUsesSize: true);
848844
childParentData.offset = _resolvedAlignment!.alongOffset(size - child.size as Offset);
849845
} else {
850-
_hasVisualOverflow = RenderStack.layoutPositionedChild(child, childParentData, size, _resolvedAlignment!) || _hasVisualOverflow;
846+
RenderStack.layoutPositionedChild(child, childParentData, size, _resolvedAlignment!);
851847
}
852848

853849
assert(child.parentData == childParentData);
@@ -889,7 +885,7 @@ class _RenderTheatre extends RenderBox with ContainerRenderObjectMixin<RenderBox
889885

890886
@override
891887
void paint(PaintingContext context, Offset offset) {
892-
if (_hasVisualOverflow && clipBehavior != Clip.none) {
888+
if (clipBehavior != Clip.none) {
893889
_clipRectLayer.layer = context.pushClipRect(
894890
needsCompositing,
895891
offset,
@@ -930,7 +926,7 @@ class _RenderTheatre extends RenderBox with ContainerRenderObjectMixin<RenderBox
930926
case Clip.hardEdge:
931927
case Clip.antiAlias:
932928
case Clip.antiAliasWithSaveLayer:
933-
return _hasVisualOverflow ? Offset.zero & size : null;
929+
return Offset.zero & size;
934930
}
935931
}
936932

packages/flutter/test/cupertino/action_sheet_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,7 @@ void main() {
953953
);
954954

955955
await tester.tap(find.text('Go'));
956-
await tester.pump();
956+
await tester.pumpAndSettle();
957957

958958
expect(
959959
semantics,

packages/flutter/test/widgets/overlay_test.dart

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:flutter/foundation.dart';
66
import 'package:flutter/widgets.dart';
77
import 'package:flutter_test/flutter_test.dart';
88

9+
import '../rendering/mock_canvas.dart';
910
import 'semantics_tester.dart';
1011

1112
void main() {
@@ -1119,6 +1120,28 @@ void main() {
11191120
}
11201121
});
11211122

1123+
testWidgets('Overlay always applies clip', (WidgetTester tester) async {
1124+
await tester.pumpWidget(
1125+
Directionality(
1126+
textDirection: TextDirection.ltr,
1127+
child: Overlay(
1128+
initialEntries: <OverlayEntry>[
1129+
OverlayEntry(
1130+
builder: (BuildContext context) => Positioned(left: 10, right: 10, child: Container()),
1131+
),
1132+
],
1133+
),
1134+
),
1135+
);
1136+
final RenderObject renderObject = tester.renderObject(find.byType(Overlay));
1137+
// ignore: avoid_dynamic_calls
1138+
expect((renderObject as dynamic).paint, paints
1139+
..save()
1140+
..clipRect(rect: const Rect.fromLTWH(0.0, 0.0, 800.0, 600.0))
1141+
..restore(),
1142+
);
1143+
});
1144+
11221145
group('OverlayEntry listenable', () {
11231146
final GlobalKey overlayKey = GlobalKey();
11241147
final Widget emptyOverlay = Directionality(

0 commit comments

Comments
 (0)