remove exceptions for systray and indicators

--remove the layout exception for the plasma systray
and behave for this just all the rest applets
--fix indicators for applets in order to consider
properly the indicators padding and applets margins.
In other words the Latte indicators for applets should
not take up all the length provided but ONLY the
applet length + indicators padding (without at any
case the applet length margins)

BUG:414104
FIXED-IN:0.9.5

containment/package/contents/ui/applet/AppletItem.qml

@@ -164,9 +164,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 &&
+    property Item appletWrapper: applet && (applet.pluginName === root.plasmoidName )? wrapper : wrapper.wrapperContainer
-                                 ((applet.pluginName === root.plasmoidName) ||
-                                  isSystray) ? wrapper : wrapper.wrapperContainer
 
     property Item tooltipVisualParent: titleTooltipParent
 

containment/package/contents/ui/applet/indicator/Loader.qml

@@ -42,8 +42,29 @@ Loader {
         return indicators.indicatorComponent;
     }
 
-    width: root.isHorizontal && canBeHovered  ? appletItem.wrapperAlias.zoomScale * visualLockedWidth : appletItem.wrapperAlias.width
+    width: {
-    height: root.isVertical && canBeHovered  ? appletItem.wrapperAlias.zoomScale * visualLockedHeight : appletItem.wrapperAlias.height
+        if (root.isHorizontal) {
+            if (canBeHovered) {
+                return appletItem.wrapperAlias.zoomScale * visualLockedWidth;
+            }
+
+            return appletWrapper.width + appletItem.internalWidthMargins;
+        } else {
+            return appletItem.wrapperAlias.width;
+        }
+    }
+
+    height: {
+        if (root.isVertical) {
+            if (canBeHovered) {
+               return appletItem.wrapperAlias.zoomScale * visualLockedHeight;
+            }
+
+            return appletWrapper.height + appletItem.internalHeightMargins;
+        } else {
+            return appletItem.wrapperAlias.height;
+        }
+    }
 
     readonly property bool locked: appletItem.lockZoom || root.zoomFactor === 1