From 0100d260241a3f2bb05a466fe4c4a3d2eb6b79a2 Mon Sep 17 00:00:00 2001
From: Devin Lin <espidev@gmail.com>
Date: Thu, 28 Oct 2021 20:11:01 -0400
Subject: [PATCH] Fix broken reset homescreen position signal, and minor
 refactor

Closes #122
---
 .../homescreen/package/contents/ui/main.qml   | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/containments/homescreen/package/contents/ui/main.qml b/containments/homescreen/package/contents/ui/main.qml
index 8232851e..f7d1b745 100644
--- a/containments/homescreen/package/contents/ui/main.qml
+++ b/containments/homescreen/package/contents/ui/main.qml
@@ -39,18 +39,42 @@ FocusScope {
 
 //END functions
 
+    // implement API signals
+    Connections {
+        target: MobileShell.HomeScreenControls
+        
+        property real lastRequestedPosition: 0
+        function onResetHomeScreenPosition() {
+            mainFlickable.scrollToPage(0);
+            root.appDrawer.close();
+        }
+        function onSnapHomeScreenPosition() {
+            if (lastRequestedPosition < 0) {
+                root.appDrawer.open();
+            } else {
+                root.appDrawer.close();
+            }
+        }
+        function onRequestRelativeScroll(pos) {
+            root.appDrawer.offset -= pos.y;
+            lastRequestedPosition = pos.y;
+        }
+    }
+
     property bool componentComplete: false
     onWidthChanged: recalculateMaxFavoriteCount()
     onHeightChanged:recalculateMaxFavoriteCount()
+    
     Component.onCompleted: {
         // ApplicationListModel doesn't have a plasmoid as is not the one that should be doing writing
         HomeScreenComponents.ApplicationListModel.loadApplications();
         HomeScreenComponents.FavoritesModel.applet = plasmoid;
         HomeScreenComponents.FavoritesModel.loadApplications();
 
+        // set API variables
         if (plasmoid.screen == 0) {
-            MobileShell.HomeScreenControls.homeScreen = root
-            MobileShell.HomeScreenControls.homeScreenWindow = root.Window.window
+            MobileShell.HomeScreenControls.homeScreen = root;
+            MobileShell.HomeScreenControls.homeScreenWindow = root.Window.window;
         }
         componentComplete = true;
         recalculateMaxFavoriteCount()
@@ -71,26 +95,6 @@ FocusScope {
         }
     }
 
-    Connections {
-        property real lastRequestedPosition: 0
-        target: MobileShell.HomeScreenControls
-        function onResetHomeScreenPosition() {
-            mainFlickable.scrollToPage(0);
-            appDrawer.close();
-        }
-        function onSnapHomeScreenPosition() {
-            if (lastRequestedPosition < 0) {
-                root.appDrawer.open();
-            } else {
-                root.appDrawer.close();
-            }
-        }
-        function onRequestRelativeScroll(pos) {
-            root.appDrawer.offset -= pos.y;
-            lastRequestedPosition = pos.y;
-        }
-    }
-
     HomeScreenComponents.FlickablePages {
         id: mainFlickable