Add support LineHeightStyle.Trim
#897
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
igordmn
approved these changes
Nov 10, 2023
mazunin-v-jb
pushed a commit
that referenced
this pull request
Dec 7, 2023
## Proposed Changes
- Set `ParagraphStyle.heightMode` based on `LineHeightStyle.Trim` value
- Align default behavior with Android
- Avoid using `StrutStyle` - it doesn't allow the line height trimming.
Set `height` via `TextStyle` instead
- Cache and post-process `lineMetrics`
- Port tests from an Android source set
## Behaviour change
In case of larger `lineHeight`, both paddings are trimmed by default to
match the Android behaviour.
## Testing
Test: run tests from `DesktopParagraphIntegrationLineHeightStyleTest`
```kt
Row(horizontalArrangement = Arrangement.spacedBy(5.dp)) {
for (lineHeightStyle in listOf(
null,
LineHeightStyle(LineHeightStyle.Alignment.Proportional, LineHeightStyle.Trim.Both),
LineHeightStyle(LineHeightStyle.Alignment.Proportional, LineHeightStyle.Trim.FirstLineTop),
LineHeightStyle(LineHeightStyle.Alignment.Proportional, LineHeightStyle.Trim.LastLineBottom),
LineHeightStyle(LineHeightStyle.Alignment.Proportional, LineHeightStyle.Trim.None),
)) {
Text("Line 1\nLine 2",
modifier = Modifier.background(Color.Gray),
style = TextStyle(
fontSize = 18.sp,
lineHeight = 50.sp,
lineHeightStyle = lineHeightStyle
)
)
}
}
```
Before | After
--- | ---
<img width="285" alt="Screenshot 2023-11-08 at 13 38 08"
src="https://github.com/JetBrains/compose-multiplatform-core/assets/1836384/2c7fbddc-dac9-408e-ad53-cedc361fe777">
| <img width="285" alt="Screenshot 2023-11-08 at 13 37 45"
src="https://github.com/JetBrains/compose-multiplatform-core/assets/1836384/4fe4d7c9-a414-4338-885f-6701e6daecf1">
## Issues Fixed
Fixes (partially)
JetBrains/compose-multiplatform#2602
Fixes JetBrains/compose-multiplatform#3866
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
ParagraphStyle.heightModebased onLineHeightStyle.TrimvalueStrutStyle- it doesn't allow the line height trimming. SetheightviaTextStyleinsteadlineMetricsBehaviour change
In case of larger
lineHeight, both paddings are trimmed by default to match the Android behaviour.Testing
Test: run tests from
DesktopParagraphIntegrationLineHeightStyleTestIssues Fixed
Fixes (partially) JetBrains/compose-multiplatform#2602
Fixes JetBrains/compose-multiplatform#3866