Merge in main for 0.23.1

# Conflicts: # gradle.properties
JetBrains · Aug 29, 2024 · 797a1fe · 797a1fe
2 parents 9a69ba3 + ef78240
commit 797a1fe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/generate-release-patch.sh b/generate-release-patch.sh
diff --git a/gradle.properties b/gradle.properties
@@ -10,4 +10,4 @@ org.jetbrains.intellij.platform.buildFeature.useBinaryReleases=false
 
 jdk.level=17
 ijp.target=233
-jewel.release.version=0.23.0
+jewel.release.version=0.23.1
diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/TextField.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/TextField.kt
@@ -261,8 +261,13 @@ private fun TextFieldDecorationBox(
             incomingConstraints.offset(horizontal = -occupiedSpaceHorizontally).copy(minHeight = 0)
         val textFieldPlaceable = measurables.single { it.layoutId == TEXT_FIELD_ID }.measure(textFieldConstraints)
 
-        // measure placeholder
-        val placeholderConstraints = textFieldConstraints.copy(minWidth = 0)
+        // measure placeholder (can't be bigger than the text)
+        val placeholderConstraints =
+            textFieldConstraints.copy(
+                minWidth = 0,
+                maxWidth = textFieldPlaceable.width,
+                maxHeight = textFieldPlaceable.height,
+            )
         val placeholderPlaceable = measurables.find { it.layoutId == PLACEHOLDER_ID }?.measure(placeholderConstraints)
 
         val width = calculateWidth(leadingPlaceable, trailingPlaceable, textFieldPlaceable, incomingConstraints)