From f3925f2ac04e053baffc82c4bbf28f17cef6e1cb Mon Sep 17 00:00:00 2001
From: Devin Lin <espidev@gmail.com>
Date: Sat, 1 Jan 2022 00:37:03 -0500
Subject: [PATCH] homescreen: Fix applet edit function calls

---
 .../qml/MobileAppletContainer.qml              |  5 ++++-
 .../qml/private/ActionButton.qml               |  4 +++-
 .../qml/private/ConfigOverlay.qml              | 18 ++++++++++++++++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/components/mobilehomescreencomponents/qml/MobileAppletContainer.qml b/components/mobilehomescreencomponents/qml/MobileAppletContainer.qml
index b3633b5e..93558aec 100644
--- a/components/mobilehomescreencomponents/qml/MobileAppletContainer.qml
+++ b/components/mobilehomescreencomponents/qml/MobileAppletContainer.qml
@@ -27,7 +27,10 @@ ContainmentLayoutManager.BasicAppletContainer {
     property real screenWidth: homeScreenState.availableScreenWidth
     property real screenHeight: homeScreenState.availableScreenHeight
     
-    configOverlayComponent: Private.ConfigOverlay {}
+    configOverlayComponent: Private.ConfigOverlay {
+        onRequestEditModeClose: appletContainer.editMode = false;
+        onRequestRemoveTrigger: appletContainer.applet.action("remove").trigger();
+    }
 
     property LauncherDragManager launcherDragManager
 
diff --git a/components/mobilehomescreencomponents/qml/private/ActionButton.qml b/components/mobilehomescreencomponents/qml/private/ActionButton.qml
index 60f71210..5d7ba9af 100644
--- a/components/mobilehomescreencomponents/qml/private/ActionButton.qml
+++ b/components/mobilehomescreencomponents/qml/private/ActionButton.qml
@@ -25,7 +25,9 @@ PlasmaCore.ToolTipArea {
     property bool checked: false
     property bool toggle: false
     property string text
+    
     signal clicked
+    signal requestEditModeClose
 
     implicitWidth: buttonRow.implicitWidth
     implicitHeight: buttonRow.implicitHeight
@@ -128,7 +130,7 @@ PlasmaCore.ToolTipArea {
             } else {
                 button.clicked()
             }
-            appletContainer.editMode = false;
+            requestEditModeClose(); 
         }
     }
 }
diff --git a/components/mobilehomescreencomponents/qml/private/ConfigOverlay.qml b/components/mobilehomescreencomponents/qml/private/ConfigOverlay.qml
index e76bc3d2..03a1878d 100644
--- a/components/mobilehomescreencomponents/qml/private/ConfigOverlay.qml
+++ b/components/mobilehomescreencomponents/qml/private/ConfigOverlay.qml
@@ -15,7 +15,11 @@ import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutM
 
 ContainmentLayoutManager.ConfigOverlayWithHandles {
     id: overlay
+    property var appletContainer
 
+    signal requestRemoveTrigger
+    signal requestEditModeClose
+    
     readonly property int iconSize: PlasmaCore.Units.iconSizes.medium
     PlasmaCore.Svg {
         id: configIconsSvg
@@ -45,8 +49,8 @@ ContainmentLayoutManager.ConfigOverlayWithHandles {
         }
         ScriptAction {
             script: {
-                appletContainer.applet.action("remove").trigger();
-                appletContainer.editMode = false;
+                overlay.requestRemoveTrigger();
+                overlay.requestEditModeClose();
             }
         }
     }
@@ -75,6 +79,11 @@ ContainmentLayoutManager.ConfigOverlayWithHandles {
                 iconSize: overlay.iconSize
                 visible: (action && typeof(action) != "undefined") ? action.enabled : false
                 action: (applet) ? applet.action("configure") : null
+                
+                onRequestEditModeClose: {
+                    overlay.requestEditModeClose();
+                }
+                
                 Component.onCompleted: {
                     if (action && typeof(action) != "undefined") {
                         action.enabled = true
@@ -103,6 +112,11 @@ ContainmentLayoutManager.ConfigOverlayWithHandles {
                 onClicked: {
                     removeAnim.restart();
                 }
+                
+                onRequestEditModeClose: {
+                    overlay.requestEditModeClose();
+                }
+                
                 Component.onCompleted: {
                     var a = applet.action("remove");
                     if (a && typeof(a) != "undefined") {