Fix component instances (#1957)

Fix mergeStyles() function to take values from base style by default, and from override view style if set. Fix opacity value when rendering.
google · Jan 6, 2025 · 2a5f8ec · 2a5f8ec
1 parent b0cb0dd
commit 2a5f8ec
Show file tree

Hide file tree

Showing 2 changed files with 191 additions and 392 deletions.
diff --git a/designcompose/src/main/java/com/android/designcompose/FrameRender.kt b/designcompose/src/main/java/com/android/designcompose/FrameRender.kt
@@ -453,7 +453,7 @@ internal fun ContentDrawScope.squooshShapeRender(
     // Blend mode
     val blendMode = style.nodeStyle.blendMode.asComposeBlendMode()
     val useBlendMode = style.nodeStyle.blendMode.useLayer()
-    val opacity = style.nodeStyle.opacity.takeIf { style.nodeStyle.hasMeterData() } ?: 1.0f
+    val opacity = style.nodeStyle.opacity.takeIf { style.nodeStyle.hasOpacity() } ?: 1.0f
 
     // Always use saveLayer for opacity; no graphicsLayer since we're not in
     // Compose.