From e3de143c6afae36e13499559197d4cdb07764ff2 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sun, 10 Aug 2025 16:50:25 +0200 Subject: [PATCH] Reduce gap b/w clock and widgets when widgets on home --- .../scaffold/ClockAndWidgetsHomeComponent.kt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/scaffold/ClockAndWidgetsHomeComponent.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/scaffold/ClockAndWidgetsHomeComponent.kt index 0456a18fe..4464cdeb4 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/scaffold/ClockAndWidgetsHomeComponent.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/scaffold/ClockAndWidgetsHomeComponent.kt @@ -100,14 +100,19 @@ internal object ClockAndWidgetsHomeComponent : ScaffoldComponent() { .padding(top = topPadding) .padding(insets), ) { + val bottomPadding by animateDpAsState( + if (fillHeight == true && scrollState.value == 0) insets.calculateBottomPadding() + else 0.dp + ) + ClockWidget( modifier = Modifier .fillMaxWidth() - then if (fillHeight == true) Modifier.height( - state.size.height.toDp() - insets.calculateTopPadding() - ).padding( - bottom = insets.calculateBottomPadding() - ) else Modifier, + then if (fillHeight == true) { + Modifier + .padding(bottom = bottomPadding) + .height(state.size.height.toDp() - insets.calculateTopPadding() - insets.calculateBottomPadding()) + } else Modifier, editMode = editMode, fillScreenHeight = fillHeight == true, )