From f74ad3c1952ec12bb3f6864a81d6d83a426a48b3 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Thu, 20 Apr 2023 20:30:08 +0200
Subject: [PATCH] Allow search bar to enter resting position when clock widget
 is not set to fill height and search bar is set to top

---
 .../main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt    | 2 +-
 .../main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 5bf137ea..17731b4e 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
@@ -483,7 +483,7 @@ fun PagerScaffold(
             derivedStateOf {
                 when {
                     pagerState.currentPageOffsetFraction != 0f -> SearchBarLevel.Raised
-                    !isSearchOpen && isWidgetsScrollZero && fillClockHeight -> SearchBarLevel.Resting
+                    !isSearchOpen && isWidgetsScrollZero && (fillClockHeight || !bottomSearchBar) -> SearchBarLevel.Resting
                     isSearchOpen && isSearchAtTop && !bottomSearchBar -> SearchBarLevel.Active
                     isSearchOpen && isSearchAtBottom && bottomSearchBar -> SearchBarLevel.Active
                     else -> SearchBarLevel.Raised
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 8b74db44..c68e7778 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
@@ -509,7 +509,7 @@ fun PullDownScaffold(
             derivedStateOf {
                 when {
                     offsetY.value != 0f -> SearchBarLevel.Raised
-                    !isSearchOpen && isWidgetsAtStart && fillClockHeight -> SearchBarLevel.Resting
+                    !isSearchOpen && isWidgetsAtStart && (fillClockHeight || !bottomSearchBar) -> SearchBarLevel.Resting
                     isSearchOpen && isSearchAtTop && !bottomSearchBar -> SearchBarLevel.Active
                     isSearchOpen && isSearchAtBottom && bottomSearchBar -> SearchBarLevel.Active
                     else -> SearchBarLevel.Raised