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

[DrawablePainter] Fix reacting to intrinsic size changes #1124

Merged
merged 8 commits into from Jun 28, 2022
Merged

[DrawablePainter] Fix reacting to intrinsic size changes #1124

Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e46d8d3
Fix DrawablePainter not reacting to intrinsic size changes
chrisbanes Apr 8, 2022
66e6043
Rename tick properties
chrisbanes Apr 12, 2022
f681dac
Fix spotless
chrisbanes Apr 12, 2022
72942a1
Fix property rename
chrisbanes Apr 12, 2022
8134226
Merge branch 'google:main' into patch-2
chrisbanes Jun 14, 2022
6d7332d
Move away from using a tick for size changes
chrisbanes Jun 28, 2022
8a62963
Merge branch 'main' into patch-2
chrisbanes Jun 28, 2022
a2fde10
Init using the drawable instrinsic size
chrisbanes Jun 28, 2022
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
24 changes: 7 additions & 17 deletions drawablepainter/src/main/java/com/google/accompanist/drawablepainter/DrawablePainter.kt
View file
Open in desktop
Expand Up @@ -58,21 +58,16 @@ private val MAIN_HANDLER by lazy(LazyThreadSafetyMode.NONE) {
class DrawablePainter(
val drawable: Drawable
) : Painter(), RememberObserver {
private var invalidateTick by mutableStateOf(0)
private var layoutTick by mutableStateOf(0)

private var lastIntrinsicSize: Size = Size.Unspecified
private var drawInvalidateTick by mutableStateOf(0)
private var drawableIntrinsicSize by mutableStateOf(Size.Unspecified)
chrisbanes marked this conversation as resolved.
Show resolved Hide resolved

private val callback: Drawable.Callback by lazy {
object : Drawable.Callback {
override fun invalidateDrawable(d: Drawable) {
// Update the tick so that we get re-drawn
invalidateTick++

if (lastIntrinsicSize != drawable.intrinsicSize) {
// If the intrinsic size has changed, update the layout tick
layoutTick++
}
drawInvalidateTick++
// Update our intrinsic size too
drawableIntrinsicSize = drawable.intrinsicSize
}

override fun scheduleDrawable(d: Drawable, what: Runnable, time: Long) {
Expand Down Expand Up @@ -128,17 +123,12 @@ class DrawablePainter(
return false
}

override val intrinsicSize: Size
get() {
// Reading this ensures that we re-layout when invalidateDrawable() is called
layoutTick
return drawable.intrinsicSize.also { lastIntrinsicSize = it }
}
override val intrinsicSize: Size get() = drawableIntrinsicSize

override fun DrawScope.onDraw() {
drawIntoCanvas { canvas ->
// Reading this ensures that we invalidate when invalidateDrawable() is called
invalidateTick
drawInvalidateTick

// Update the Drawable's bounds
drawable.setBounds(0, 0, size.width.roundToInt(), size.height.roundToInt())
Expand Down