From 97c701e691d781be2f32493d32fe5cc5af89955d Mon Sep 17 00:00:00 2001 From: xiaji Date: Fri, 6 Mar 2026 23:32:15 +0800 Subject: [PATCH] Fix: adjust content text field height to display 5 lines fully in merge screen --- .../main/java/com/inspection/camera/ui/merge/MergeScreen.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/inspection/camera/ui/merge/MergeScreen.kt b/app/src/main/java/com/inspection/camera/ui/merge/MergeScreen.kt index 4d29c26..5b68b1d 100644 --- a/app/src/main/java/com/inspection/camera/ui/merge/MergeScreen.kt +++ b/app/src/main/java/com/inspection/camera/ui/merge/MergeScreen.kt @@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.grid.GridCells @@ -371,7 +372,7 @@ fun MergeScreen( }, label = { Text("内容（最多5行）") }, modifier = Modifier.fillMaxWidth(), - minLines = 2, + minLines = 5, maxLines = 5 ) }