Skip to content

Commit

Permalink
Fix merging styles (#476)
Browse files Browse the repository at this point in the history
  • Loading branch information
MatkovIvan committed Apr 3, 2023
1 parent d8cc7a6 commit de18d9c
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ internal data class ComputedStyle(

fun merge(density: Density, other: SpanStyle) {
val fontSize = fontSizeInHierarchy(density, fontSize, other.fontSize)
textForegroundStyle.merge(other.textForegroundStyle)
textForegroundStyle = textForegroundStyle.merge(other.textForegroundStyle)
other.fontFamily?.let { fontFamily = it }
this.fontSize = fontSize
other.fontWeight?.let { fontWeight = it }
Expand Down

0 comments on commit de18d9c

Please sign in to comment.