github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Push physical layers with paths instead of rects in RenderPhysicalModel. (#13942)" (#13988)

Browse Source 
This reverts commit 57b4a52555.
This commit is contained in:
amirh 2018-01-08 19:24:19 -08:00 committed by GitHub
parent 57b4a52555
commit 61a8132ea9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/internal/engine.version
View File

@ -1 +1 @@
d8740c70a58ada74aff5b773e2bec9d622c42a97
6a724f0d3e22d41246baf3447d7ba2c9ff886765

15
packages/flutter/lib/src/rendering/layer.dart
View File

@ -755,20 +755,20 @@ class PhysicalModelLayer extends ContainerLayer {
/// Creates a composited layer that uses a physical model to producing
/// lighting effects.
///
/// The [clipPath], [elevation], and [color] arguments must not be null.
/// The [clipRRect], [elevation], and [color] arguments must not be null.
PhysicalModelLayer({
@required this.clipPath,
@required this.clipRRect,
@required this.elevation,
@required this.color,
}) : assert(clipPath != null),
}) : assert(clipRRect != null),
assert(elevation != null),
assert(color != null);
/// The path to clip in the parent's coordinate system.
/// The rounded-rect to clip in the parent's coordinate system.
///
/// The scene must be explicitly recomposited after this property is changed
/// (as described at [Layer]).
Path clipPath;
RRect clipRRect;
/// The z-coordinate at which to place this physical object.
///
@ -784,8 +784,8 @@ class PhysicalModelLayer extends ContainerLayer {
@override
void addToScene(ui.SceneBuilder builder, Offset layerOffset) {
builder.pushPhysicalShape(
path: clipPath.shift(layerOffset),
builder.pushPhysicalModel(
rrect: clipRRect.shift(layerOffset),
elevation: elevation,
color: color,
);
@ -796,6 +796,7 @@ class PhysicalModelLayer extends ContainerLayer {
@override
void debugFillProperties(DiagnosticPropertiesBuilder description) {
super.debugFillProperties(description);
description.add(new DiagnosticsProperty<RRect>('clipRRect', clipRRect));
description.add(new DoubleProperty('elevation', elevation));
description.add(new DiagnosticsProperty<Color>('color', color));
}

5
packages/flutter/lib/src/rendering/proxy_box.dart
View File

@ -1426,10 +1426,9 @@ class RenderPhysicalModel extends _RenderCustomClip<RRect> {
_updateClip();
final RRect offsetClipRRect = _clip.shift(offset);
final Rect offsetBounds = offsetClipRRect.outerRect;
final Path offsetClipPath = new Path()..addRRect(offsetClipRRect);
if (needsCompositing) {
final PhysicalModelLayer physicalModel = new PhysicalModelLayer(
clipPath: offsetClipPath,
clipRRect: offsetClipRRect,
elevation: elevation,
color: color,
);
@ -1446,7 +1445,7 @@ class RenderPhysicalModel extends _RenderCustomClip<RRect> {
_transparentPaint,
);
canvas.drawShadow(
offsetClipPath,
new Path()..addRRect(offsetClipRRect),
shadowColor,
elevation,
color.alpha != 0xFF,