Skip to content

fix(ui): disable mod card placement animations on resize #1070

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

Merged
Wyvest merged 1 commit into from
Sep 9, 2026
Merged

fix(ui): disable mod card placement animations on resize #1070

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions modules/internal/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/screens/Mods.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.pointer.PointerIcon
import androidx.compose.ui.input.pointer.pointerHoverIcon
import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalWindowInfo
import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.dp
import androidx.compose.ui.text.font.FontWeight
Expand Down Expand Up @@ -157,6 +160,10 @@ fun ColumnScope.ModsGrid(category: ModCategory) {
val entries = remember(flat) { flat.toMutableStateList() }

val gridState = rememberRestorableLazyGridState("mods")
val density = LocalDensity.current
val windowSize = LocalWindowInfo.current.containerSize
// Only enable placement animations after the grid has been laid out for the current size
var animateItems by remember(windowSize, density) { mutableStateOf(false) }
val reorderState = rememberGridReorderState(
gridState = gridState,
onMove = { from, to -> entries.add(to, entries.removeAt(from)) },
Expand All @@ -170,7 +177,9 @@ fun ColumnScope.ModsGrid(category: ModCategory) {
columns = GridCells.Fixed(4),
verticalArrangement = Arrangement.spacedBy(19.dp),
horizontalArrangement = Arrangement.spacedBy(19.dp),
modifier = Modifier.padding(end = 16.dp),
modifier = Modifier.padding(end = 16.dp).onGloballyPositioned {
animateItems = true
},
) {
items(
entries,
Expand All @@ -181,7 +190,7 @@ fun ColumnScope.ModsGrid(category: ModCategory) {
when (entry) {
is ModGridEntry.Header -> ModTypeHeader(
entry,
modifier = Modifier.animateItem(placementSpec = ModCardPlacementSpec),
modifier = if (animateItems) Modifier.animateItem(placementSpec = ModCardPlacementSpec) else Modifier,
onToggle = { ModCardTypeCollapseStore.toggle(entry.type.id) },
)

Expand All @@ -191,7 +200,15 @@ fun ColumnScope.ModsGrid(category: ModCategory) {
ModCard(
mod,
modifier = Modifier
.animateItem(placementSpec = if (dragging) null else ModCardPlacementSpec)
.then(
if (animateItems) {
Modifier.animateItem(
placementSpec = if (dragging) null else ModCardPlacementSpec,
)
} else {
Modifier
},
)
.reorderableItem(reorderState, mod.id),
)
}
Expand Down
Loading