diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt index 7dcc2ac4..305fea0a 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt @@ -495,6 +495,7 @@ fun PagerScaffold( .then(clockHeight?.let { Modifier.height(it) } ?: Modifier) .padding(bottom = clockPadding), editMode = isWidgetEditMode, + fillScreenHeight = fillClockHeight, ) WidgetColumn( diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt index 9de892c6..6aec5882 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt @@ -472,6 +472,7 @@ fun PullDownScaffold( .then(clockHeight?.let { Modifier.height(it) } ?: Modifier) .padding(bottom = clockPadding), editMode = isWidgetEditMode, + fillScreenHeight = fillClockHeight, ) WidgetColumn( diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/ClockWidget.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/ClockWidget.kt index f82b92c1..bb1dfd65 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/ClockWidget.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/ClockWidget.kt @@ -82,6 +82,7 @@ import de.mm20.launcher2.ui.settings.clockwidget.ClockWidgetSettingsScreenVM @Composable fun ClockWidget( modifier: Modifier = Modifier, + fillScreenHeight: Boolean, editMode: Boolean = false, ) { val viewModel: ClockWidgetVM = viewModel() @@ -153,7 +154,7 @@ fun ClockWidget( Column(modifier = modifier) { Box( modifier = Modifier - .weight(1f) + .then(if(fillScreenHeight) Modifier.weight(1f) else Modifier) .fillMaxWidth(), contentAlignment = when (alignment) { ClockWidgetAlignment.Center -> Alignment.Center