nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2570 from davotoula/fix-zoom-dialog-squash

Browse Source 
fix(zoom): keep aspect ratio during the avatar zoom-in animation
This commit is contained in:
Vitor Pamplona
2026-04-25 12:00:57 -04:00
committed by GitHub
parent c3ca03365f 5861e3a7e5
commit 9a96a214c0
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentDialog.kt
+14 -7
View File
@@ -274,15 +274,22 @@ private fun DialogContent(
.graphicsLayer { .graphicsLayer {
val src = sourceBounds val src = sourceBounds
val img = imageBounds val img = imageBounds
if (src != null && img != null && img.width > 0f && img.height > 0f) { if (src != null && img != null &&
src.width > 0f && src.height > 0f &&
img.width > 0f && img.height > 0f
) {
transformOrigin = TransformOrigin(0f, 0f) transformOrigin = TransformOrigin(0f, 0f)
val startScaleX = src.width / img.width // Uniform scale so non-square images keep their aspect ratio during
val startScaleY = src.height / img.height // the grow animation. max() so the image covers the source rect in
// at least one dimension; the other overflows centered on the tap.
val startScale = maxOf(src.width / img.width, src.height / img.height)
val srcCenter = src.center
val imgCenter = img.center
val p = progress() val p = progress()
scaleX = lerp(startScaleX, 1f, p) scaleX = lerp(startScale, 1f, p)
scaleY = lerp(startScaleY, 1f, p) scaleY = lerp(startScale, 1f, p)
translationX = lerp(src.left - img.left * startScaleX, 0f, p) translationX = lerp(srcCenter.x - startScale * imgCenter.x, 0f, p)
translationY = lerp(src.top - img.top * startScaleY, 0f, p) translationY = lerp(srcCenter.y - startScale * imgCenter.y, 0f, p)
} else { } else {
// No source bounds: fall back to a plain fade. // No source bounds: fall back to a plain fade.
alpha = progress() alpha = progress()