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

am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev

Browse Source 
* commit 'b2411c622cf9124f6af5f70d416adb179f9c88bb':
  Fix GcSnapshot drawInLayer when clipping is used.
This commit is contained in:
Diego Perez
2015-06-15 09:50:51 +00:00
committed by Android Git Automerger
parent 5c597c1d89 b2411c622c
commit 2422011d86
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/GcSnapshot.java
View File

@@ -616,6 +616,8 @@ public class GcSnapshot {
return; return;
} }
int x = 0;
int y = 0;
int width; int width;
int height; int height;
Rectangle clipBounds = originalGraphics.getClipBounds(); Rectangle clipBounds = originalGraphics.getClipBounds();
@@ -626,6 +628,8 @@ public class GcSnapshot {
} }
// If we have clipBounds available, use them as they will always be // If we have clipBounds available, use them as they will always be
// smaller than the full layer size. // smaller than the full layer size.
x = clipBounds.x;
y = clipBounds.y;
width = clipBounds.width; width = clipBounds.width;
height = clipBounds.height; height = clipBounds.height;
} else { } else {
@@ -646,13 +650,20 @@ public class GcSnapshot {
true /*compositeOnly*/, forceMode); true /*compositeOnly*/, forceMode);
try { try {
// The main draw operation. // The main draw operation.
// We translate the operation to take into account that the rendering does not
// know about the clipping area.
imageGraphics.translate(-x, -y);
drawable.draw(imageGraphics, paint); drawable.draw(imageGraphics, paint);
// Apply the color filter. // Apply the color filter.
// Restore the original coordinates system and apply the filter only to the
// clipped area.
imageGraphics.translate(x, y);
filter.applyFilter(imageGraphics, width, height); filter.applyFilter(imageGraphics, width, height);
// Draw the tinted image on the main layer. // Draw the tinted image on the main layer using as start point the clipping
configuredGraphics.drawImage(image, 0, 0, null); // upper left coordinates.
configuredGraphics.drawImage(image, x, y, null);
layer.change(); layer.change();
} finally { } finally {
// dispose Graphics2D objects // dispose Graphics2D objects