firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Overlay always applies clip (#113770)" (#114442)

Browse Source 
This reverts commit 103a5c98b8cac6bdcc8c8af1094d1e6f98453fe6.
This commit is contained in:
chunhtai 2022-11-01 12:05:01 -07:00 committed by GitHub
parent e6b429694a
commit d0afbd72a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/flutter/lib/src/widgets/overlay.dart
View File

@ -709,6 +709,8 @@ class _RenderTheatre extends RenderBox with ContainerRenderObjectMixin<RenderBox
addAll(children); addAll(children);
} }
bool _hasVisualOverflow = false;
@override @override
void setupParentData(RenderBox child) { void setupParentData(RenderBox child) {
if (child.parentData is! StackParentData) { if (child.parentData is! StackParentData) {
@ -834,6 +836,8 @@ class _RenderTheatre extends RenderBox with ContainerRenderObjectMixin<RenderBox
@override @override
void performLayout() { void performLayout() {
_hasVisualOverflow = false;
if (_onstageChildCount == 0) { if (_onstageChildCount == 0) {
return; return;
} }
@ -852,7 +856,7 @@ class _RenderTheatre extends RenderBox with ContainerRenderObjectMixin<RenderBox
child.layout(nonPositionedConstraints, parentUsesSize: true); child.layout(nonPositionedConstraints, parentUsesSize: true);
childParentData.offset = _resolvedAlignment!.alongOffset(size - child.size as Offset); childParentData.offset = _resolvedAlignment!.alongOffset(size - child.size as Offset);
} else { } else {
RenderStack.layoutPositionedChild(child, childParentData, size, _resolvedAlignment!); _hasVisualOverflow = RenderStack.layoutPositionedChild(child, childParentData, size, _resolvedAlignment!) || _hasVisualOverflow;
} }
assert(child.parentData == childParentData); assert(child.parentData == childParentData);
@ -894,7 +898,7 @@ class _RenderTheatre extends RenderBox with ContainerRenderObjectMixin<RenderBox
@override @override
void paint(PaintingContext context, Offset offset) { void paint(PaintingContext context, Offset offset) {
if (clipBehavior != Clip.none) { if (_hasVisualOverflow && clipBehavior != Clip.none) {
_clipRectLayer.layer = context.pushClipRect( _clipRectLayer.layer = context.pushClipRect(
needsCompositing, needsCompositing,
offset, offset,
@ -935,7 +939,7 @@ class _RenderTheatre extends RenderBox with ContainerRenderObjectMixin<RenderBox
case Clip.hardEdge: case Clip.hardEdge:
case Clip.antiAlias: case Clip.antiAlias:
case Clip.antiAliasWithSaveLayer: case Clip.antiAliasWithSaveLayer:
return Offset.zero & size; return _hasVisualOverflow ? Offset.zero & size : null;
} }
} }

2
packages/flutter/test/cupertino/action_sheet_test.dart
View File

@ -952,7 +952,7 @@ void main() {
); );
await tester.tap(find.text('Go')); await tester.tap(find.text('Go'));
await tester.pumpAndSettle(); await tester.pump();
expect( expect(
semantics, semantics,

23
packages/flutter/test/widgets/overlay_test.dart
View File

@ -6,7 +6,6 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
import '../rendering/mock_canvas.dart';
import 'semantics_tester.dart'; import 'semantics_tester.dart';
void main() { void main() {
@ -1120,28 +1119,6 @@ void main() {
} }
}); });
testWidgets('Overlay always applies clip', (WidgetTester tester) async {
await tester.pumpWidget(
Directionality(
textDirection: TextDirection.ltr,
child: Overlay(
initialEntries: <OverlayEntry>[
OverlayEntry(
builder: (BuildContext context) => Positioned(left: 10, right: 10, child: Container()),
),
],
),
),
);
final RenderObject renderObject = tester.renderObject(find.byType(Overlay));
// ignore: avoid_dynamic_calls
expect((renderObject as dynamic).paint, paints
..save()
..clipRect(rect: const Rect.fromLTWH(0.0, 0.0, 800.0, 600.0))
..restore(),
);
});
group('OverlayEntry listenable', () { group('OverlayEntry listenable', () {
final GlobalKey overlayKey = GlobalKey(); final GlobalKey overlayKey = GlobalKey();
final Widget emptyOverlay = Directionality( final Widget emptyOverlay = Directionality(