Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DrawablePainter] Stop pre-scaling the Canvas #458

Merged
merged 1 commit into from
Jun 1, 2021
Merged

[DrawablePainter] Stop pre-scaling the Canvas #458

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions imageloading-core/src/main/java/com/google/accompanist/imageloading/DrawablePainter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,18 +129,10 @@ class DrawablePainter(
// Reading this ensures that we invalidate when invalidateDrawable() is called
invalidateTick

// Update the Drawable's bounds
drawable.setBounds(0, 0, size.width.roundToInt(), size.height.roundToInt())

canvas.withSave {
if (drawable.intrinsicWidth > 0 && drawable.intrinsicHeight > 0) {
// Painters are responsible for scaling content to meet the canvas size
canvas.scale(
sx = size.width / drawable.intrinsicWidth,
sy = size.height / drawable.intrinsicHeight
)
} else {
// If the drawable has no intrinsic bounds, set its bounds to be the
// canvas size
drawable.setBounds(0, 0, size.width.roundToInt(), size.height.roundToInt())
}
drawable.draw(canvas.nativeCanvas)
}
}
Expand Down