From d705d5a6573470a90161e5ce53f1b167464ca093 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Tue, 23 Oct 2018 15:16:29 +0300
Subject: [PATCH] fixes for new Communicator protocol

---
 .../package/contents/code/AppletIdentifier.js |  2 +-
 .../package/contents/ui/applet/AppletItem.qml | 22 ++++++++-----------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/containment/package/contents/code/AppletIdentifier.js b/containment/package/contents/code/AppletIdentifier.js
index ad0ba9256..c47267e1c 100644
--- a/containment/package/contents/code/AppletIdentifier.js
+++ b/containment/package/contents/code/AppletIdentifier.js
@@ -29,7 +29,7 @@ function typeOf(obj, className){
 }
 
 function reconsiderAppletIconItem(){
-    if (communicator.appletIconItem || !applet || container.disableLatteParabolicIconHeuristics || container.disableLatteIconOverlay)
+    if (communicator.appletIconItem || !applet)
         return;
 
     //! searching to find for that applet the first IconItem
diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml
index 9bfa39592..710368171 100644
--- a/containment/package/contents/ui/applet/AppletItem.qml
+++ b/containment/package/contents/ui/applet/AppletItem.qml
@@ -419,26 +419,22 @@ Item {
 
         //set up the overlaied containers and properties for when a overlaiedIconItem must be presented to the user
         //because the plasma widgets specific implementation breaks the Latte experience
-        onCanShowOverlaiedLatteIconChanged: {
-            if (canShowOverlaiedLatteIcon) {
-                applet.opacity = 0;
-
-                if (applet.pluginName === "org.kde.plasma.folder") {
-                    applet.parent =  wrapper.containerForOverlayIcon;
-                    applet.anchors.fill = wrapper.containerForOverlayIcon;
-                }
+        onOverlayLatteIconIsActiveChanged:{
+            if (!overlayLatteIconIsActive && applet.opacity===0) {
+                applet.opacity = 1;
 
                 wrapper.disableScaleWidth = false;
                 wrapper.disableScaleHeight = false;
 
                 wrapper.updateLayoutWidth();
                 wrapper.updateLayoutHeight();
-            }
-        }
+            } else if (overlayLatteIconIsActive && applet.opacity>0) {
+                applet.opacity = 0;
 
-        onDisableLatteParabolicIconHeuristicsChanged: {
-            if (communicator.disableLatteParabolicIconHeuristics && applet.opacity === 0) {
-                applet.opacity = 1;
+                if (applet.pluginName === "org.kde.plasma.folder") {
+                    applet.parent =  wrapper.containerForOverlayIcon;
+                    applet.anchors.fill = wrapper.containerForOverlayIcon;
+                }
 
                 wrapper.disableScaleWidth = false;
                 wrapper.disableScaleHeight = false;