mirror of
https://github.com/austinried/subtracks.git
synced 2026-11-11 15:29:15 +01:00
clip the inactive tab copy out from under the indicator so the active colour is exact
This commit is contained in:
@@ -80,7 +80,10 @@ import androidx.compose.ui.draw.drawWithContent
|
|||||||
import androidx.compose.ui.focus.FocusRequester
|
import androidx.compose.ui.focus.FocusRequester
|
||||||
import androidx.compose.ui.focus.focusRequester
|
import androidx.compose.ui.focus.focusRequester
|
||||||
import androidx.compose.ui.geometry.Rect
|
import androidx.compose.ui.geometry.Rect
|
||||||
|
import androidx.compose.ui.graphics.ClipOp
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
|
import androidx.compose.ui.graphics.Path
|
||||||
|
import androidx.compose.ui.graphics.drawscope.clipPath
|
||||||
import androidx.compose.ui.graphics.drawscope.clipRect
|
import androidx.compose.ui.graphics.drawscope.clipRect
|
||||||
import androidx.compose.ui.graphics.lerp
|
import androidx.compose.ui.graphics.lerp
|
||||||
import androidx.compose.ui.graphics.vector.ImageVector
|
import androidx.compose.ui.graphics.vector.ImageVector
|
||||||
@@ -725,32 +728,44 @@ private fun TabButton(
|
|||||||
val selectedContent = artwork?.scheme?.onPrimary ?: MaterialTheme.colorScheme.background
|
val selectedContent = artwork?.scheme?.onPrimary ?: MaterialTheme.colorScheme.background
|
||||||
val paddingStart = with(LocalDensity.current) { 8.dp.toPx() }
|
val paddingStart = with(LocalDensity.current) { 8.dp.toPx() }
|
||||||
var tabLeft by remember { mutableFloatStateOf(0f) }
|
var tabLeft by remember { mutableFloatStateOf(0f) }
|
||||||
|
val clipStart = indicatorLeft?.minus(tabLeft + paddingStart)
|
||||||
|
val clipEnd = indicatorRight?.minus(tabLeft + paddingStart)
|
||||||
Box(
|
Box(
|
||||||
modifier =
|
modifier =
|
||||||
modifier
|
modifier
|
||||||
.onGloballyPositioned { tabLeft = it.boundsInParent().left }
|
.onGloballyPositioned { tabLeft = it.boundsInParent().left }
|
||||||
.clickable(onClick = onClick)
|
.clickable(onClick = onClick)
|
||||||
.padding(start = 8.dp, end = 12.dp, top = 6.dp, bottom = 6.dp),
|
.padding(start = 8.dp, end = 12.dp, top = 6.dp, bottom = 6.dp),
|
||||||
|
) {
|
||||||
|
if (clipStart != null && clipEnd != null) {
|
||||||
|
Box(
|
||||||
|
modifier =
|
||||||
|
Modifier.drawWithContent {
|
||||||
|
val hole =
|
||||||
|
Path().apply {
|
||||||
|
addRect(Rect(clipStart, 0f, clipEnd, size.height))
|
||||||
|
}
|
||||||
|
clipPath(hole, clipOp = ClipOp.Difference) {
|
||||||
|
this@drawWithContent.drawContent()
|
||||||
|
}
|
||||||
|
},
|
||||||
) {
|
) {
|
||||||
TabContent(tab, progress, MaterialTheme.colorScheme.onBackground)
|
TabContent(tab, progress, MaterialTheme.colorScheme.onBackground)
|
||||||
if (indicatorLeft != null && indicatorRight != null) {
|
}
|
||||||
Box(
|
Box(
|
||||||
modifier =
|
modifier =
|
||||||
Modifier
|
Modifier
|
||||||
.clearAndSetSemantics {}
|
.clearAndSetSemantics {}
|
||||||
.drawWithContent {
|
.drawWithContent {
|
||||||
clipRect(
|
clipRect(clipStart, 0f, clipEnd, size.height) {
|
||||||
left = indicatorLeft - tabLeft - paddingStart,
|
|
||||||
top = 0f,
|
|
||||||
right = indicatorRight - tabLeft - paddingStart,
|
|
||||||
bottom = size.height,
|
|
||||||
) {
|
|
||||||
this@drawWithContent.drawContent()
|
this@drawWithContent.drawContent()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
) {
|
) {
|
||||||
TabContent(tab, progress, selectedContent)
|
TabContent(tab, progress, selectedContent)
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
TabContent(tab, progress, MaterialTheme.colorScheme.onBackground)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ fun MiniPlayer(
|
|||||||
Column {
|
Column {
|
||||||
MiniPlayerProgressBar(
|
MiniPlayerProgressBar(
|
||||||
progress = progress,
|
progress = progress,
|
||||||
modifier = Modifier.fillMaxWidth().height(3.dp),
|
modifier = Modifier.fillMaxWidth().height(4.dp),
|
||||||
)
|
)
|
||||||
Row(
|
Row(
|
||||||
modifier =
|
modifier =
|
||||||
|
|||||||
Reference in New Issue
Block a user