Skip to content
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

Jump to bottom

Fix missing size for applied ShaderBrush to span #1389

Merged
merged 1 commit into from
Jun 7, 2024
Merged

Fix missing size for applied ShaderBrush to span #1389

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/SkiaParagraph.skiko.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ internal class SkiaParagraph(
}

init {
// Size is not known until layout is complete but to apply it, we need to re-create
// skia's paragraph :'(
// layouter might use cached instance if no [ShaderBrush] was applied.
layouter.setBrushSize(Size(width, height))
igordmn marked this conversation as resolved.
Show resolved Hide resolved
paragraph = layouter.layoutParagraph(width)

paragraph.layout(width)
}

Expand Down
25 changes: 22 additions & 3 deletions ...ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/platform/ParagraphLayouter.skiko.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,23 @@ package androidx.compose.ui.text.platform

import androidx.compose.ui.geometry.Size
import androidx.compose.ui.geometry.isUnspecified
import androidx.compose.ui.graphics.*
import androidx.compose.ui.graphics.BlendMode
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ShaderBrush
import androidx.compose.ui.graphics.Shadow
import androidx.compose.ui.graphics.drawscope.DrawStyle
import androidx.compose.ui.graphics.takeOrElse
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.ExperimentalTextApi
import androidx.compose.ui.text.Placeholder
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.style.LineHeightStyle
import androidx.compose.ui.text.style.ResolvedTextDirection
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.unit.Density
import kotlin.math.abs
import org.jetbrains.skia.Paint
import org.jetbrains.skia.paragraph.LineMetrics
import org.jetbrains.skia.paragraph.Paragraph

Expand Down Expand Up @@ -94,6 +97,22 @@ internal class ParagraphLayouter(
}
}

fun setBrushSize(
brushSize: Size,
) {
if (builder.brushSize != brushSize) {
builder.brushSize = brushSize

// [brushSize] requires only for shader recreation and does not require re-layout,
// but we have to invalidate it because it's backed into skia's paragraph.
// Since it affects only [ShaderBrush] we can keep the cache if it's not used.
if (builder.textStyle.brush is ShaderBrush ||
builder.spanStyles.any { it.item.brush is ShaderBrush }) {
paragraphCache = null
}
}
}

fun setTextStyle(
color: Color,
shadow: Shadow?,
Expand Down