Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge: a912fed

Browse Source 
* commit 'a0fb87a3b831e8eb4e4f7e03fc170cf8f93a2161':
  Do not paint shadow if outside of the clip area
This commit is contained in:
Diego Perez
2015-02-17 22:24:14 +00:00
committed by Android Git Automerger
parent f12d02339f a0fb87a3b8
commit d66f2eb241
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/layoutlib/bridge/src/android/view/ViewGroup_Delegate.java
View File

@@ -71,8 +71,10 @@ public class ViewGroup_Delegate {
int x = 0; int x = 0;
if (outline.mRect != null) { if (outline.mRect != null) {
Shadow s = getRectShadow(parent, canvas, child, outline); Shadow s = getRectShadow(parent, canvas, child, outline);
shadow = s.mShadow; if (s != null) {
x = -s.mShadowWidth; shadow = s.mShadow;
x = -s.mShadowWidth;
}
} else if (outline.mPath != null) { } else if (outline.mPath != null) {
shadow = getPathShadow(child, outline, canvas); shadow = getPathShadow(child, outline, canvas);
} }
@@ -132,6 +134,9 @@ public class ViewGroup_Delegate {
private static BufferedImage getPathShadow(View child, Outline outline, Canvas canvas) { private static BufferedImage getPathShadow(View child, Outline outline, Canvas canvas) {
Rect clipBounds = canvas.getClipBounds(); Rect clipBounds = canvas.getClipBounds();
if (clipBounds.isEmpty()) {
return null;
}
BufferedImage image = new BufferedImage(clipBounds.width(), clipBounds.height(), BufferedImage image = new BufferedImage(clipBounds.width(), clipBounds.height(),
BufferedImage.TYPE_INT_ARGB); BufferedImage.TYPE_INT_ARGB);
Graphics2D graphics = image.createGraphics(); Graphics2D graphics = image.createGraphics();