From ecd39f543592e922fa7f57a79592e4298eeaba8f Mon Sep 17 00:00:00 2001 From: tarsin Date: Fri, 17 Mar 2023 20:01:42 +0800 Subject: [PATCH] Fix clip preview crop --- .../main/java/com/hippo/ehviewer/ui/widget/EhAsyncThumb.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/widget/EhAsyncThumb.kt b/app/src/main/java/com/hippo/ehviewer/ui/widget/EhAsyncThumb.kt index 2807586c9..2a8070ac9 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/widget/EhAsyncThumb.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/widget/EhAsyncThumb.kt @@ -70,7 +70,12 @@ fun EhAsyncPreview( onState = { if (it is AsyncImagePainter.State.Success) { it.result.drawable.run { - if ((intrinsicWidth.toFloat() / intrinsicHeight) in 0.5..0.8 && model.offsetX == Int.MIN_VALUE) { + if (intrinsicWidth.toFloat() / intrinsicHeight in 0.5..0.8) { + if (contentScale == ContentScale.Fit) contentScale = ContentScale.Crop + } + } + model.run { + if (clipWidth.toFloat() / clipHeight in 0.5..0.8) { if (contentScale == ContentScale.Fit) contentScale = ContentScale.Crop } }