Skip to content

Fix text clipping and overlapping at large font scales #1726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
srikrishnasakunia merged 1 commit into from
Oct 6, 2026
Merged

Fix text clipping and overlapping at large font scales #1726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Jetchat/app/src/main/java/com/example/compose/jetchat/components/BaseLineHeightModifier.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import androidx.compose.ui.layout.Measurable
import androidx.compose.ui.layout.MeasureResult
import androidx.compose.ui.layout.MeasureScope
import androidx.compose.ui.unit.Constraints
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.TextUnit

/**
* Applied to a Text, it sets the distance between the top and the first baseline. It
Expand All @@ -39,7 +39,7 @@ import androidx.compose.ui.unit.Dp
* This modifier can be used to distribute multiple text elements using a certain distance between
* baselines.
*/
data class BaselineHeightModifier(val heightFromBaseline: Dp) : LayoutModifier {
data class BaselineHeightModifier(val heightFromBaseline: TextUnit) : LayoutModifier {

override fun MeasureScope.measure(measurable: Measurable, constraints: Constraints): MeasureResult {

Expand All @@ -55,4 +55,4 @@ data class BaselineHeightModifier(val heightFromBaseline: Dp) : LayoutModifier {
}
}

fun Modifier.baselineHeight(heightFromBaseline: Dp): Modifier = this.then(BaselineHeightModifier(heightFromBaseline))
fun Modifier.baselineHeight(heightFromBaseline: TextUnit): Modifier = this.then(BaselineHeightModifier(heightFromBaseline))
6 changes: 3 additions & 3 deletions Jetchat/app/src/main/java/com/example/compose/jetchat/components/JetchatDrawer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ private fun ChatItem(text: String, selected: Boolean, onChatClicked: () -> Unit)
}
Row(
modifier = Modifier
.height(56.dp)
.heightIn(min = 56.dp)
.fillMaxWidth()
.padding(horizontal = 12.dp)
.clip(CircleShape)
Expand Down Expand Up @@ -179,7 +179,7 @@ private fun ProfileItem(text: String, @DrawableRes profilePic: Int?, selected: B
}
Row(
modifier = Modifier
.height(56.dp)
.heightIn(min = 56.dp)
.fillMaxWidth()
.padding(horizontal = 12.dp)
.clip(CircleShape)
Expand Down Expand Up @@ -247,7 +247,7 @@ private fun WidgetDiscoverability() {
val context = LocalContext.current
Row(
modifier = Modifier
.height(56.dp)
.heightIn(min = 56.dp)
.fillMaxWidth()
.padding(horizontal = 12.dp)
.clip(CircleShape)
Expand Down
3 changes: 2 additions & 1 deletion Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/Conversation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ import androidx.compose.foundation.layout.exclude
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.ime
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.navigationBars
Expand Down Expand Up @@ -675,7 +676,7 @@ fun DayHeader(dayString: String) {
Row(
modifier = Modifier
.padding(vertical = 12.dp, horizontal = 16.dp)
.height(24.dp),
.heightIn(min = 24.dp),
verticalAlignment = Alignment.CenterVertically,
) {
DayHeaderLine()
Expand Down
9 changes: 5 additions & 4 deletions Jetchat/app/src/main/java/com/example/compose/jetchat/profile/Profile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.example.compose.jetchat.FunctionalityNotAvailablePopup
import com.example.compose.jetchat.R
import com.example.compose.jetchat.components.AnimatingFabContent
Expand Down Expand Up @@ -112,13 +113,13 @@ private fun NameAndPosition(userData: ProfileScreenState) {
Column(modifier = Modifier.padding(horizontal = 16.dp)) {
Name(
userData,
modifier = Modifier.baselineHeight(32.dp),
modifier = Modifier.baselineHeight(32.sp),
)
Position(
userData,
modifier = Modifier
.padding(bottom = 20.dp)
.baselineHeight(24.dp),
.baselineHeight(24.sp),
)
}
}
Expand Down Expand Up @@ -171,7 +172,7 @@ fun ProfileProperty(label: String, value: String, isLink: Boolean = false) {
HorizontalDivider()
Text(
text = label,
modifier = Modifier.baselineHeight(24.dp),
modifier = Modifier.baselineHeight(24.sp),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
Expand All @@ -182,7 +183,7 @@ fun ProfileProperty(label: String, value: String, isLink: Boolean = false) {
}
Text(
text = value,
modifier = Modifier.baselineHeight(24.dp),
modifier = Modifier.baselineHeight(24.sp),
style = style,
)
}
Expand Down
Loading