From b5ceb4d91ab3934296d31f0f7ebc36bea8f7ff1a Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Mon, 28 Dec 2020 10:23:36 +0200
Subject: [PATCH] tasksparabolic:use view triggering values

---
 app/view/view.cpp                                  |  9 ++++++---
 .../package/contents/ui/applet/ParabolicArea.qml   | 10 ----------
 .../package/contents/ui/task/ParabolicArea.qml     | 14 ++------------
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/app/view/view.cpp b/app/view/view.cpp
index cf607bafd..0ab4436bf 100644
--- a/app/view/view.cpp
+++ b/app/view/view.cpp
@@ -1292,6 +1292,10 @@ void View::setCurrentParabolicItem(QQuickItem *item)
         return;
     }
 
+    if (item && m_currentParabolicItem) {
+        QMetaObject::invokeMethod(item, "parabolicExited", Qt::QueuedConnection);
+    }
+
     m_currentParabolicItem = item;
     emit currentParabolicItemChanged();
 }
@@ -1440,7 +1444,7 @@ bool View::event(QEvent *e)
                         //! sending move event to parabolic item    
                         QMetaObject::invokeMethod(m_currentParabolicItem,
                                                   "parabolicMove",
-                                                  Qt::DirectConnection,
+                                                  Qt::QueuedConnection,
                                                   Q_ARG(qreal, internal.x()),
                                                   Q_ARG(qreal, internal.y()));
                     } else {
@@ -1587,14 +1591,13 @@ void View::onCurrentParabolicItemChanged()
     m_parabolicItemNullifier.stop();
 
     if (m_currentParabolicItem != nullptr) {
-        //! send the ParabolicEnter because the
         QPointF internal = m_currentParabolicItem->mapFromScene(m_lastOrphanParabolicMove);
 
         if (m_currentParabolicItem->contains(internal)) {
             //! sending enter event to parabolic item
             QMetaObject::invokeMethod(m_currentParabolicItem,
                                       "parabolicEntered",
-                                      Qt::DirectConnection,
+                                      Qt::QueuedConnection,
                                       Q_ARG(qreal, internal.x()),
                                       Q_ARG(qreal, internal.y()));
         }
diff --git a/containment/package/contents/ui/applet/ParabolicArea.qml b/containment/package/contents/ui/applet/ParabolicArea.qml
index 84d8e2081..e826c1ca9 100644
--- a/containment/package/contents/ui/applet/ParabolicArea.qml
+++ b/containment/package/contents/ui/applet/ParabolicArea.qml
@@ -48,16 +48,6 @@ Item {
         }
     }
 
-    Connections {
-        target: appletItem.parabolic
-
-        onCurrentParabolicItemChanged: {
-            if (appletItem.parabolic.currentParabolicItem !== _parabolicArea) {
-                _parabolicArea.parabolicExited();
-            }
-        }
-    }
-
     onParabolicEntered: {
         appletItem.parabolic.stopRestoreZoomTimer();
 
diff --git a/plasmoid/package/contents/ui/task/ParabolicArea.qml b/plasmoid/package/contents/ui/task/ParabolicArea.qml
index 398b3da5d..53e504e5d 100644
--- a/plasmoid/package/contents/ui/task/ParabolicArea.qml
+++ b/plasmoid/package/contents/ui/task/ParabolicArea.qml
@@ -46,16 +46,6 @@ Item {
         }
     }
 
-    Connections {
-        target: taskItem.parabolic
-
-        onCurrentParabolicItemChanged: {
-            if (taskItem.parabolic.currentParabolicItem !== _parabolicArea) {
-                _parabolicArea.parabolicExited();
-            }
-        }
-    }
-
     Connections{
         target: root
 
@@ -112,7 +102,8 @@ Item {
 
         //! do not send any parabolic mouse movement. At this point mouseX/Y are NOT valid/accurate
         var current = root.isHorizontal ? mouseX : mouseY;
-        console.log(" current spot ENTER : " + current);
+        icList.currentSpot = current;
+        calculateParabolicScales(current);
     }
 
     onParabolicMove: {
@@ -120,7 +111,6 @@ Item {
         lastMouseY = mouseY;
 
         var mousePos = root.isHorizontal ? mouseX : mouseY;
-        console.log(" current move : " + mousePos);
 
         if (mousePos<0 || (inBlockingAnimation && !(inAttentionAnimation||inFastRestoreAnimation||inMimicParabolicAnimation)))
             return;