Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
d0afbd72
Unverified
Commit
d0afbd72
authored
Nov 01, 2022
by
chunhtai
Committed by
GitHub
Nov 01, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Overlay always applies clip (#113770)" (#114442)
This reverts commit
103a5c98
.
parent
e6b42969
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
27 deletions
+8
-27
overlay.dart
packages/flutter/lib/src/widgets/overlay.dart
+7
-3
action_sheet_test.dart
packages/flutter/test/cupertino/action_sheet_test.dart
+1
-1
overlay_test.dart
packages/flutter/test/widgets/overlay_test.dart
+0
-23
No files found.
packages/flutter/lib/src/widgets/overlay.dart
View file @
d0afbd72
...
@@ -709,6 +709,8 @@ class _RenderTheatre extends RenderBox with ContainerRenderObjectMixin<RenderBox
...
@@ -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
...
@@ -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
...
@@ -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
...
@@ -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
...
@@ -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
;
}
}
}
}
...
...
packages/flutter/test/cupertino/action_sheet_test.dart
View file @
d0afbd72
...
@@ -952,7 +952,7 @@ void main() {
...
@@ -952,7 +952,7 @@ void main() {
);
);
await
tester
.
tap
(
find
.
text
(
'Go'
));
await
tester
.
tap
(
find
.
text
(
'Go'
));
await
tester
.
pump
AndSettle
();
await
tester
.
pump
();
expect
(
expect
(
semantics
,
semantics
,
...
...
packages/flutter/test/widgets/overlay_test.dart
View file @
d0afbd72
...
@@ -6,7 +6,6 @@ import 'package:flutter/foundation.dart';
...
@@ -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() {
...
@@ -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
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment