From 5c6a3a9d23e707f7c101f8c6ccc56f406c0e63f9 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sat, 6 May 2017 14:13:13 +0300 Subject: [PATCH] fix clearzoom when hover,no hoveredcapable applets --- containment/contents/ui/AppletItem.qml | 4 +++ containment/contents/ui/main.qml | 44 ++++++++++++++++++++++++-- plasmoid/contents/ui/TaskDelegate.qml | 4 +-- plasmoid/contents/ui/main.qml | 8 +++++ 4 files changed, 56 insertions(+), 4 deletions(-) diff --git a/containment/contents/ui/AppletItem.qml b/containment/contents/ui/AppletItem.qml index a24f66263..821695201 100644 --- a/containment/contents/ui/AppletItem.qml +++ b/containment/contents/ui/AppletItem.qml @@ -1132,6 +1132,10 @@ Item { onExited:{ if (appletIconItem) appletIconItem.active = false; + + if (root.zoomFactor>1){ + checkRestoreZoom.start(); + } } onPositionChanged: { diff --git a/containment/contents/ui/main.qml b/containment/contents/ui/main.qml index b1d833ea4..5e13dd883 100644 --- a/containment/contents/ui/main.qml +++ b/containment/contents/ui/main.qml @@ -135,7 +135,7 @@ DragDrop.DropArea { //center the layout correctly when the user uses an offset property int offsetFixed: (offset===0 || panelAlignment === Latte.Dock.Center || plasmoid.configuration.panelPosition === Latte.Dock.Justify)? - offset : offset+panelMarginLength/2+totalPanelEdgeSpacing/2 + offset : offset+panelMarginLength/2+totalPanelEdgeSpacing/2 property int realSize: iconSize + iconMargin property int realPanelSize: 0 @@ -973,6 +973,45 @@ DragDrop.DropArea { return splitters; } + + function mouseInCanBeHoveredApplet(){ + if (latteApplet && latteApplet.containsMouse()) + return true; + + var applets = startLayout.children; + + for(var i=0; i