From 0e002567dc99ed7aef43f72b3547a07ae9f534b2 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Tue, 5 Jan 2021 20:09:49 +0200
Subject: [PATCH] drop LayoutsContainer.restoreZoomIsBlocked

--Parabolic Host Ability is quite capable to handle
this properly
---
 .../contents/ui/abilities/ParabolicEffect.qml |  3 +-
 .../privates/ParabolicEffectPrivate.qml       | 37 ++++++++++++++++++-
 .../ui/layouts/abilities/AbilityGrid.qml      | 19 ----------
 .../ui/layouts/abilities/AbilityLayouts.qml   |  4 --
 .../abilities/types/ParabolicEffect.qml       |  1 -
 containment/package/contents/ui/main.qml      |  2 +-
 6 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/containment/package/contents/ui/abilities/ParabolicEffect.qml b/containment/package/contents/ui/abilities/ParabolicEffect.qml
index 2f8442c2e..77b03c3a5 100644
--- a/containment/package/contents/ui/abilities/ParabolicEffect.qml
+++ b/containment/package/contents/ui/abilities/ParabolicEffect.qml
@@ -30,8 +30,7 @@ Ability.ParabolicEffectPrivate {
     isEnabled: factor.zoom>1 && !root.inConfigureAppletsMode
     factor.zoom: LatteCore.WindowSystem.compositingActive && animations.active ? ( 1 + (plasmoid.configuration.zoomLevel / 20) ) : 1
     factor.maxZoom: Math.max(factor.zoom, animations.requirements.zoomFactor)
-    restoreZoomIsBlocked: (view && view.contextMenuIsShown)
-                          || (applets.parabolic.restoreZoomIsBlocked)
+    restoreZoomIsBlocked: restoreZoomIsBlockedFromApplet || (view && view.contextMenuIsShown)
 
     currentParabolicItem: view ? view.parabolic.currentItem : null
 }
diff --git a/containment/package/contents/ui/abilities/privates/ParabolicEffectPrivate.qml b/containment/package/contents/ui/abilities/privates/ParabolicEffectPrivate.qml
index 7ebae0d5e..55023388b 100644
--- a/containment/package/contents/ui/abilities/privates/ParabolicEffectPrivate.qml
+++ b/containment/package/contents/ui/abilities/privates/ParabolicEffectPrivate.qml
@@ -30,12 +30,13 @@ AbilityHost.ParabolicEffect {
     id: parabolic
 
     property Item animations: null
-    property Item applets: null
     property Item debug: null
+    property Item layouts: null
     property QtObject view: null
 
     readonly property bool horizontal: plasmoid.formFactor === PlasmaCore.Types.Horizontal
 
+    property bool restoreZoomIsBlockedFromApplet: false
     property int lastParabolicItemIndex: -1
 
     Connections {
@@ -78,6 +79,40 @@ AbilityHost.ParabolicEffect {
         }
     }
 
+    //! do not update during dragging/moving applets inConfigureAppletsMode
+    readonly property bool isBindingUpdateEnabled: !(root.dragOverlay && root.dragOverlay.pressed)
+
+    Binding{
+        target: parabolic
+        property: "restoreZoomIsBlockedFromApplet"
+        when: isBindingUpdateEnabled
+        value: {
+            var grid;
+
+            for (var l=0; l<=2; ++l) {
+                if (l===0) {
+                    grid = layouts.startLayout;
+                } else if (l===1) {
+                    grid = layouts.mainLayout;
+                } else if (l===2) {
+                    grid = layouts.endLayout;
+                }
+
+                for (var i=0; i<grid.children.length; ++i){
+                    var appletItem = grid.children[i];
+                    if (appletItem
+                            && appletItem.communicator
+                            && appletItem.communicator.parabolicEffectIsSupported
+                            && appletItem.communicator.bridge.parabolic.client.local.restoreZoomIsBlocked) {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+    }
+
     function startRestoreZoomTimer(){
         if (restoreZoomIsBlocked) {
             return;
diff --git a/containment/package/contents/ui/layouts/abilities/AbilityGrid.qml b/containment/package/contents/ui/layouts/abilities/AbilityGrid.qml
index 8c526c366..864fdb824 100644
--- a/containment/package/contents/ui/layouts/abilities/AbilityGrid.qml
+++ b/containment/package/contents/ui/layouts/abilities/AbilityGrid.qml
@@ -27,25 +27,6 @@ AbilityGridPrivate {
     //! do not update during dragging/moving applets inConfigureAppletsMode
     readonly property bool updateIsBlocked: root.dragOverlay && root.dragOverlay.pressed
 
-    Binding{
-        target: ability.parabolic
-        property: "restoreZoomIsBlocked"
-        when: !updateIsBlocked
-        value: {
-            for (var i=0; i<grid.children.length; ++i){
-                var appletItem = grid.children[i];
-                if (appletItem
-                        && appletItem.communicator
-                        && appletItem.communicator.parabolicEffectIsSupported
-                        && appletItem.communicator.bridge.parabolic.client.local.restoreZoomIsBlocked) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-    }
-
     Binding{
         target: ability.require
         property: "windowsTrackingCount"
diff --git a/containment/package/contents/ui/layouts/abilities/AbilityLayouts.qml b/containment/package/contents/ui/layouts/abilities/AbilityLayouts.qml
index 64a0b4de9..a173b01f8 100644
--- a/containment/package/contents/ui/layouts/abilities/AbilityLayouts.qml
+++ b/containment/package/contents/ui/layouts/abilities/AbilityLayouts.qml
@@ -20,10 +20,6 @@
 import QtQuick 2.7
 
 AbilityLayoutsPrivate {
-    parabolic.restoreZoomIsBlocked: startLayout.ability.parabolic.restoreZoomIsBlocked
-                                    || mainLayout.ability.parabolic.restoreZoomIsBlocked
-                                    || endLayout.ability.parabolic.restoreZoomIsBlocked
-
     require.windowsTrackingCount: startLayout.ability.require.windowsTrackingCount +
                                   mainLayout.ability.require.windowsTrackingCount +
                                   endLayout.ability.require.windowsTrackingCount
diff --git a/containment/package/contents/ui/layouts/abilities/types/ParabolicEffect.qml b/containment/package/contents/ui/layouts/abilities/types/ParabolicEffect.qml
index bcb7bebe0..fa3494472 100644
--- a/containment/package/contents/ui/layouts/abilities/types/ParabolicEffect.qml
+++ b/containment/package/contents/ui/layouts/abilities/types/ParabolicEffect.qml
@@ -20,6 +20,5 @@
 import QtQuick 2.7
 
 Item {
-    property bool restoreZoomIsBlocked: false
     property int lastIndex: -1
 }
diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml
index 02f0626ec..87ede8626 100644
--- a/containment/package/contents/ui/main.qml
+++ b/containment/package/contents/ui/main.qml
@@ -1418,8 +1418,8 @@ Item {
     Ability.ParabolicEffect {
         id: _parabolic
         animations: _animations
-        applets: layoutsContainer.applets
         debug: _debug
+        layouts: layoutsContainer
         view: latteView
     }