BetterAndroid/FlexiUI
5
0
Fork 0
mirror of https://github.com/BetterAndroid/FlexiUI.git synced 2025-09-09 03:54:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: make softWrap follow singleLine and change overflow default to TextOverflow.Ellipsis in Text

Browse Source
This commit is contained in:
fankesyooni
2023-12-02 14:00:38 +08:00
parent 9364486397
commit 223bf662ce
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Text.kt
View File

@@ -44,11 +44,11 @@ fun Text(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
color: Color = Color.Unspecified, color: Color = Color.Unspecified,
style: TextStyle = Text.style, style: TextStyle = Text.style,
overflow: TextOverflow = TextOverflow.Clip,
softWrap: Boolean = true,
singleLine: Boolean = false, singleLine: Boolean = false,
maxLines: Int = if (singleLine) 1 else Int.MAX_VALUE, maxLines: Int = if (singleLine) 1 else Int.MAX_VALUE,
minLines: Int = 1, minLines: Int = 1,
overflow: TextOverflow = TextOverflow.Ellipsis,
softWrap: Boolean = !singleLine || maxLines > 1,
onTextLayout: (TextLayoutResult) -> Unit = {} onTextLayout: (TextLayoutResult) -> Unit = {}
) { ) {
Text( Text(
@@ -71,11 +71,11 @@ fun Text(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
color: Color = Color.Unspecified, color: Color = Color.Unspecified,
style: TextStyle = Text.style, style: TextStyle = Text.style,
overflow: TextOverflow = TextOverflow.Clip,
softWrap: Boolean = true,
singleLine: Boolean = false, singleLine: Boolean = false,
maxLines: Int = if (singleLine) 1 else Int.MAX_VALUE, maxLines: Int = if (singleLine) 1 else Int.MAX_VALUE,
minLines: Int = 1, minLines: Int = 1,
overflow: TextOverflow = TextOverflow.Ellipsis,
softWrap: Boolean = !singleLine || maxLines > 1,
inlineContent: Map<String, InlineTextContent> = mapOf(), inlineContent: Map<String, InlineTextContent> = mapOf(),
onTextLayout: (TextLayoutResult) -> Unit = {} onTextLayout: (TextLayoutResult) -> Unit = {}
) { ) {