diff --git a/containments/homescreen/package/contents/ui/AppletsArea.qml b/containments/homescreen/package/contents/ui/AppletsArea.qml index a99d04d9..9804a4c7 100644 --- a/containments/homescreen/package/contents/ui/AppletsArea.qml +++ b/containments/homescreen/package/contents/ui/AppletsArea.qml @@ -36,7 +36,7 @@ MouseEventListener { height: mainLayout.Layout.minimumHeight property int margin: stripe.height + units.gridUnit * 2 property Item draggingApplet - + onPressAndHold: { print(favoritesView.contains(mapToItem(favoritesView, mouse.x, mouse.y))) if (!root.locked && !favoritesView.contains(mapToItem(favoritesView, mouse.x, mouse.y))) { diff --git a/containments/homescreen/package/contents/ui/main.qml b/containments/homescreen/package/contents/ui/main.qml index e658af89..7bfc9f04 100644 --- a/containments/homescreen/package/contents/ui/main.qml +++ b/containments/homescreen/package/contents/ui/main.qml @@ -159,6 +159,7 @@ Item { //not used yet property bool animationsEnabled: false property Item applet + z: applet && applet.compactRepresentationItem && applet.expanded ? 99 : 0 Layout.fillWidth: true Layout.fillHeight: applet && applet.Layout.fillHeight Layout.onFillHeightChanged: { @@ -166,6 +167,7 @@ Item { checkLastSpacer(); } } + onAppletChanged: { if (applet.backgroundHints == PlasmaCore.Types.StandardBackground) { applet.anchors.margins = background.margins.top; diff --git a/shell/contents/applet/CompactApplet.qml b/shell/contents/applet/CompactApplet.qml index 5228e7a9..2338bd66 100644 --- a/shell/contents/applet/CompactApplet.qml +++ b/shell/contents/applet/CompactApplet.qml @@ -42,13 +42,14 @@ Item { } onFullRepresentationChanged: { - +print(fullRepresentation); if (!fullRepresentation) { return; } fullRepresentation.parent = appletParent; fullRepresentation.anchors.fill = fullRepresentation.parent; + fullRepresentation.anchors.margins = appletParent.margins.top; } Rectangle { @@ -63,8 +64,11 @@ Item { visible: plasmoid.expanded } - Item { + PlasmaCore.FrameSvgItem { id: appletParent + imagePath: "widgets/background" + visible: fullRepresentation.parent == appletParent + z: 99 opacity: plasmoid.expanded ? 1 : 0 anchors.top: parent.top width: parent.width