From 55704d520b3164e1bf04ff9c493b8097def5bb64 Mon Sep 17 00:00:00 2001 From: nrobi144 Date: Thu, 28 May 2026 13:12:36 +0300 Subject: [PATCH] =?UTF-8?q?fix(desktop):=20ripple/hover=20clipping=20?= =?UTF-8?q?=E2=80=94=20correct=20modifier=20ordering?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - SidebarNavItem/SidebarFeedItem: .clip().clickable().background() — ripple now clipped to RoundedCornerShape(8dp) bounds - ColumnHeader: .padding() before .pointerInput() — gesture detection respects horizontal padding - SearchPill: .clip(pill shape) before .hoverHighlight() — hover drawBehind rect clipped to pill shape, not parent rectangle Co-Authored-By: Claude Opus 4.6 (1M context) --- .../vitorpamplona/amethyst/desktop/ui/deck/ColumnHeader.kt | 3 ++- .../com/vitorpamplona/amethyst/desktop/ui/deck/DeckSidebar.kt | 4 ++-- .../vitorpamplona/amethyst/desktop/ui/search/SearchPill.kt | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/deck/ColumnHeader.kt b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/deck/ColumnHeader.kt index 629b5fa127..a857721427 100644 --- a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/deck/ColumnHeader.kt +++ b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/deck/ColumnHeader.kt @@ -58,11 +58,12 @@ fun ColumnHeader( .fillMaxWidth() .height(48.dp) .background(MaterialTheme.colorScheme.surfaceContainer) + .padding(horizontal = 12.dp) .pointerInput(Unit) { detectTapGestures( onDoubleTap = { onDoubleClick() }, ) - }.padding(horizontal = 12.dp), + }, verticalAlignment = Alignment.CenterVertically, ) { if (hasBackStack) { diff --git a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/deck/DeckSidebar.kt b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/deck/DeckSidebar.kt index 8ba2841162..8b909bfb23 100644 --- a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/deck/DeckSidebar.kt +++ b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/deck/DeckSidebar.kt @@ -417,8 +417,8 @@ private fun SidebarNavItem( .fillMaxWidth() .padding(horizontal = 8.dp, vertical = 2.dp) .clip(RoundedCornerShape(8.dp)) - .background(backgroundColor) .clickable(onClick = onClick) + .background(backgroundColor) .onPointerEvent(PointerEventType.Enter) { isHovered = true } .onPointerEvent(PointerEventType.Exit) { isHovered = false } .padding(horizontal = 8.dp, vertical = 8.dp), @@ -489,8 +489,8 @@ private fun SidebarFeedItem( .fillMaxWidth() .padding(horizontal = 8.dp, vertical = 2.dp) .clip(RoundedCornerShape(8.dp)) - .background(backgroundColor) .clickable(onClick = onClick) + .background(backgroundColor) .onPointerEvent(PointerEventType.Enter) { isHovered = true } .onPointerEvent(PointerEventType.Exit) { isHovered = false } .padding(horizontal = 8.dp, vertical = 8.dp), diff --git a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/search/SearchPill.kt b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/search/SearchPill.kt index 24c7c0b2a9..71a51f668b 100644 --- a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/search/SearchPill.kt +++ b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/search/SearchPill.kt @@ -33,6 +33,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp import com.vitorpamplona.amethyst.commons.icons.symbols.Icon import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols @@ -49,7 +50,7 @@ fun SearchPill( onClick = onClick, shape = RoundedCornerShape(999.dp), color = MaterialTheme.colorScheme.surfaceContainerHigh, - modifier = modifier.height(36.dp).hoverHighlight(), + modifier = modifier.height(36.dp).clip(RoundedCornerShape(999.dp)).hoverHighlight(), ) { Row( verticalAlignment = Alignment.CenterVertically,