From 6631516913a7a7ef3813840072c95bf33845be10 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Fri, 19 May 2017 18:25:18 +0300 Subject: [PATCH] consider needsFill applets as !canBeHovered --- containment/package/contents/ui/applet/AppletItem.qml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml index db9b225f0..65d0533f5 100644 --- a/containment/package/contents/ui/applet/AppletItem.qml +++ b/containment/package/contents/ui/applet/AppletItem.qml @@ -40,8 +40,8 @@ Item { property bool animationsEnabled: true property bool animationWasSent: false //protection flag for animation broadcasting property bool canBeHovered: true - property bool inFillCalculations: false //it is used in calculations for fillWidth,fillHeight applets - property bool needsFillSpace: { //it is used in calculations for fillWidth,fillHeight applets + property bool inFillCalculations: false //temp record, is used in calculations for fillWidth,fillHeight applets + property bool needsFillSpace: { //fill flag, it is used in calculations for fillWidth,fillHeight applets if (!applet || !applet.Layout || (applet && applet.pluginName === "org.kde.plasma.panelspacer")) return false; @@ -197,10 +197,11 @@ Item { } function checkCanBeHovered(){ - if ( ((applet && (applet.Layout.minimumWidth > root.iconSize) && root.isHorizontal) || + if ( (((applet && (applet.Layout.minimumWidth > root.iconSize) && root.isHorizontal) || (applet && (applet.Layout.minimumHeight > root.iconSize) && root.isVertical)) && (applet && applet.pluginName !== "org.kde.plasma.panelspacer") - && !container.fakeIconItem){ + && !container.fakeIconItem) + || (container.needsFillSpace)){ canBeHovered = false; } else{ @@ -278,6 +279,8 @@ Item { } } + onNeedsFillSpaceChanged: checkCanBeHovered(); + onShowZoomedChanged: { if(showZoomed){ //var newZ = container.maxHeight / root.iconSize;