ssbg04/AndroidLiquidGlass
1
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix outline drawing

Browse Source
This commit is contained in:
Kyant0 committed 2025-09-15 19:54:13 +08:00
1 parent 4ba62d75ea
commit 7697b3bf97
3 files changed
+23 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

backdrop/src/main/java/com/kyant/backdrop/highlight/HighlightModifier.kt
+10 -4
View File
@@ -7,7 +7,6 @@ import androidx.compose.ui.draw.CacheDrawModifierNode
import androidx.compose.ui.geometry.Size
import androidx.compose.ui.graphics.GraphicsLayerScope
import androidx.compose.ui.graphics.Outline
import androidx.compose.ui.graphics.Path
import androidx.compose.ui.graphics.asAndroidPath
import androidx.compose.ui.graphics.asComposePaint
import androidx.compose.ui.graphics.asComposeRenderEffect
@@ -107,13 +106,20 @@ internal class HighlightNode(
when (outline) {
is Outline.Rectangle -> {
val rect = RectF(0f, 0f, size.width, size.height)
val rect = RectF(0f, 0f, borderSize.width, borderSize.height)
canvas.drawRect(rect, paint)
}
is Outline.Rounded -> {
val path = Path().apply { addRoundRect(outline.roundRect) }.asAndroidPath()
canvas.drawPath(path, paint)
@Suppress("INVISIBLE_REFERENCE")
val path = outline.roundRectPath?.asAndroidPath()
if (path != null) {
canvas.drawPath(path, paint)
} else {
val rect = with(outline.roundRect) { RectF(left, top, right, bottom) }
val radius = outline.roundRect.topLeftCornerRadius.x
canvas.drawRoundRect(rect, radius, radius, paint)
}
}
is Outline.Generic -> {
backdrop/src/main/java/com/kyant/backdrop/shadow/ShadowModifier.kt
+13 -5
View File
@@ -1,5 +1,6 @@
package com.kyant.backdrop.shadow
import android.graphics.BlendMode
import android.graphics.Paint
import android.graphics.PorterDuff
import android.graphics.PorterDuffXfermode
@@ -8,7 +9,6 @@ import android.os.Build
import androidx.compose.ui.draw.CacheDrawModifierNode
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Outline
import androidx.compose.ui.graphics.Path
import androidx.compose.ui.graphics.asAndroidPath
import androidx.compose.ui.graphics.asComposePaint
import androidx.compose.ui.graphics.drawscope.translate
@@ -76,7 +76,7 @@ internal class ShadowNode(
private val maskPaint =
Paint().apply {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
blendMode = android.graphics.BlendMode.DST_OUT
blendMode = BlendMode.DST_OUT
} else {
xfermode = PorterDuffXfermode(PorterDuff.Mode.DST_OUT)
}
@@ -118,9 +118,17 @@ internal class ShadowNode(
}
is Outline.Rounded -> {
val path = Path().apply { addRoundRect(outline.roundRect) }.asAndroidPath()
canvas.drawPath(path, shadowPaint)
canvas.drawPath(path, maskPaint)
@Suppress("INVISIBLE_REFERENCE")
val path = outline.roundRectPath?.asAndroidPath()
if (path != null) {
canvas.drawPath(path, shadowPaint)
canvas.drawPath(path, maskPaint)
} else {
val rect = with(outline.roundRect) { RectF(left, top, right, bottom) }
val radius = outline.roundRect.topLeftCornerRadius.x
canvas.drawRoundRect(rect, radius, radius, shadowPaint)
canvas.drawRoundRect(rect, radius, radius, maskPaint)
}
}
is Outline.Generic -> {