From d8fe0e90d50b0d68892777401e85a4d0b70cb510 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Mon, 1 Feb 2021 17:37:35 +0200
Subject: [PATCH] drop plasmoidName variable from containment

---
 containment/package/contents/ui/applet/AppletItem.qml       | 4 ++--
 containment/package/contents/ui/applet/colorizer/Applet.qml | 5 +++--
 containment/package/contents/ui/editmode/ConfigOverlay.qml  | 6 ++++--
 containment/package/contents/ui/main.qml                    | 2 --
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml
index c0a839e17..57c743fbe 100644
--- a/containment/package/contents/ui/applet/AppletItem.qml
+++ b/containment/package/contents/ui/applet/AppletItem.qml
@@ -89,7 +89,7 @@ Item {
     property bool lockZoom: false
 
     property bool isActive: (isExpanded
-                             && applet.pluginName !== root.plasmoidName
+                             && !appletItem.communicator.indexerIsSupported
                              && applet.pluginName !== "org.kde.activeWindowControl"
                              && applet.pluginName !== "org.kde.plasma.appmenu")
 
@@ -295,7 +295,7 @@ Item {
     property Item latteStyleApplet: applet && ((applet.pluginName === "org.kde.latte.spacer") || (applet.pluginName === "org.kde.latte.separator")) ?
                                         (applet.children[0] ? applet.children[0] : null) : null
 
-    property Item appletWrapper: applet && (applet.pluginName === root.plasmoidName )? wrapper : wrapper.wrapperContainer
+    property Item appletWrapper: wrapper.wrapperContainer
 
     property Item tooltipVisualParent: titleTooltipParent
 
diff --git a/containment/package/contents/ui/applet/colorizer/Applet.qml b/containment/package/contents/ui/applet/colorizer/Applet.qml
index 9175189b7..d0b6deab8 100644
--- a/containment/package/contents/ui/applet/colorizer/Applet.qml
+++ b/containment/package/contents/ui/applet/colorizer/Applet.qml
@@ -49,8 +49,9 @@ Item {
 
             readonly property int shadowSize : appletItem.myView.itemShadow.size
 
-            readonly property bool forcedShadow: root.forceTransparentPanel && plasmoid.configuration.appletShadowsEnabled
-                                                 && applet && applet.pluginName !== root.plasmoidName ? true : false
+            readonly property bool forcedShadow: root.forceTransparentPanel
+                                                 && plasmoid.configuration.appletShadowsEnabled
+                                                 && !appletItem.communicator.indexerIsSupported ? true : false
         }
     }
 }
diff --git a/containment/package/contents/ui/editmode/ConfigOverlay.qml b/containment/package/contents/ui/editmode/ConfigOverlay.qml
index c44da16ee..625aa9ee4 100644
--- a/containment/package/contents/ui/editmode/ConfigOverlay.qml
+++ b/containment/package/contents/ui/editmode/ConfigOverlay.qml
@@ -504,8 +504,10 @@ MouseArea {
             if (visualParent && currentApplet
                     && (currentApplet.applet || currentApplet.isSeparator || currentApplet.isInternalViewSplitter)) {
 
-                configureButton.visible = !currentApplet.isInternalViewSplitter && (currentApplet.applet.pluginName !== root.plasmoidName)
-                        && currentApplet.applet.action("configure") && currentApplet.applet.action("configure").enabled;
+                configureButton.visible = !currentApplet.isInternalViewSplitter
+                        && (currentApplet.applet.pluginName !== "org.kde.latte.plasmoid")
+                        && currentApplet.applet.action("configure")
+                        && currentApplet.applet.action("configure").enabled;
                 closeButton.visible = !currentApplet.isInternalViewSplitter && currentApplet.applet.action("remove") && currentApplet.applet.action("remove").enabled;
                 lockButton.visible = !currentApplet.isInternalViewSplitter
                         && !currentApplet.communicator.indexerIsSupported
diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml
index 964ad44e8..50a40833e 100644
--- a/containment/package/contents/ui/main.qml
+++ b/containment/package/contents/ui/main.qml
@@ -318,8 +318,6 @@ Item {
     property int widthMargins: root.isVertical ? metrics.totals.thicknessEdges : metrics.totals.lengthEdges
     property int heightMargins: root.isHorizontal ? metrics.totals.thicknessEdges : metrics.totals.lengthEdges
 
-    readonly property string plasmoidName: "org.kde.latte.plasmoid"
-
     property var iconsArray: [16, 22, 32, 48, 64, 96, 128, 256]
 
     property Item dragOverlay: _dragOverlay