Merge branch 'master' into master-android

This commit is contained in:
Evgeny Poberezkin committed 2026-06-23 15:21:42 +01:00
commit f46cf38567
8 files changed
+127 -29

No files matched your search

@@ -176,7 +176,7 @@ fun CIImageView(
.then(
if (!smallView) {
val w = if (previewBitmap.width * 0.97 <= previewBitmap.height) imageViewFullWidth() * 0.75f else DEFAULT_MAX_IMAGE_WIDTH
Modifier.width(w).aspectRatio((previewBitmap.width.toFloat() / previewBitmap.height.toFloat()).coerceAtLeast(1f / 2.33f))
Modifier.width(w).aspectRatio((previewBitmap.width.toFloat() / previewBitmap.height.toFloat()).coerceIn(1f / 2.33f, 2.33f))
} else Modifier
)
.desktopModifyBlurredState(!smallView, blurred, showMenu),
+4 -4
View File
@@ -24,13 +24,13 @@ android.nonTransitiveRClass=true
kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.jvm.target=11
android.version_name=7.0-beta.0
android.version_code=356
android.version_name=7.0-beta.1
android.version_code=360
android.bundle=false
desktop.version_name=7.0-beta.0
desktop.version_code=147
desktop.version_name=7.0-beta.1
desktop.version_code=149
kotlin.version=2.1.20
gradle.plugin.version=8.7.0