From 108daf50dbcdd6a8e20d0bf918ad12390955bd96 Mon Sep 17 00:00:00 2001
From: Devin Lin <espidev@gmail.com>
Date: Thu, 23 Jun 2022 17:02:32 -0400
Subject: [PATCH] homescreens/halcyon: Fix overshoot

---
 .../halcyon/package/contents/ui/GridAppList.qml      |  2 +-
 .../halcyon/package/contents/ui/HomeScreen.qml       | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml b/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml
index 676ec079..aa47e02e 100644
--- a/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml
+++ b/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml
@@ -35,7 +35,7 @@ GridView {
 
     header: Controls.Control {
         implicitWidth: gridView.width
-        topPadding: PlasmaCore.Units.largeSpacing + Math.round(gridView.height * 0.2)
+        topPadding: PlasmaCore.Units.largeSpacing + Math.round(gridView.height * 0.25)
         bottomPadding: PlasmaCore.Units.largeSpacing
         leftPadding: PlasmaCore.Units.smallSpacing
         
diff --git a/containments/homescreens/halcyon/package/contents/ui/HomeScreen.qml b/containments/homescreens/halcyon/package/contents/ui/HomeScreen.qml
index 6172eaa8..e1a55809 100644
--- a/containments/homescreens/halcyon/package/contents/ui/HomeScreen.qml
+++ b/containments/homescreens/halcyon/package/contents/ui/HomeScreen.qml
@@ -73,12 +73,14 @@ Item {
                 onVerticalOvershootChanged: {
                     if (dragging && verticalOvershoot < 0) {
                         if (!openingSearchWidget) {
-                            openingSearchWidget = true;
-                            root.searchWidget.startGesture();
+                            if (oldVerticalOvershoot === 0) {
+                                openingSearchWidget = true;
+                                root.searchWidget.startGesture();
+                            }
+                        } else {
+                            let offset = -(verticalOvershoot - oldVerticalOvershoot);
+                            root.searchWidget.updateGestureOffset(-offset);
                         }
-                        
-                        let offset = -(verticalOvershoot - oldVerticalOvershoot);
-                        root.searchWidget.updateGestureOffset(-offset);
                     }
                     oldVerticalOvershoot = verticalOvershoot;
                 }