From 51b600725d292aeb571fb45f6552264252fb11e8 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Thu, 25 May 2017 21:04:12 +0300 Subject: [PATCH] fix parabolic effect and Tasks thickness --this fixes the Tasks plasmoid thickness and improves a small breakage in the parabolic effect. The Tasks thickness is going to maximum when there is a hoveredInded in plasmoid or in containment. --the previous fix, fixes also a small breakage in the parabolic effect animation. The breakage was appearing when going from applet->applet separator->task and directRender is enabled --- containment/package/contents/ui/applet/AppletItem.qml | 2 +- containment/package/contents/ui/applet/AppletItemWrapper.qml | 4 ++-- plasmoid/package/contents/ui/main.qml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml index e533fee71..f7bb27503 100644 --- a/containment/package/contents/ui/applet/AppletItem.qml +++ b/containment/package/contents/ui/applet/AppletItem.qml @@ -559,7 +559,7 @@ Item { //! only to support springloading for plasma 5.10 //! also on this is based the tooltips behavior by enabling it //! plasma tooltips are disabled - visible: !lockZoom && canBeHovered && !(container.isSeparator && !root.editMode) //&& (root.zoomFactor>1) + visible: !container.latteApplet && !lockZoom && canBeHovered && !(container.isSeparator && !root.editMode) //&& (root.zoomFactor>1) property bool pressed: false diff --git a/containment/package/contents/ui/applet/AppletItemWrapper.qml b/containment/package/contents/ui/applet/AppletItemWrapper.qml index 1414770e1..e33117c34 100644 --- a/containment/package/contents/ui/applet/AppletItemWrapper.qml +++ b/containment/package/contents/ui/applet/AppletItemWrapper.qml @@ -50,7 +50,7 @@ Item{ //return container.sizeForFill; } - if (latteApplet) { + if (container.latteApplet) { if (container.showZoomed && root.isVertical) return root.statesLineSize + root.thickMargin + root.iconSize + 1; else @@ -79,7 +79,7 @@ Item{ //return container.sizeForFill; } - if (latteApplet) { + if (container.latteApplet) { if (container.showZoomed && root.isHorizontal) return root.statesLineSize + root.thickMargin + root.iconSize + 1; else diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml index 6ed075b03..2d6eef5e4 100644 --- a/plasmoid/package/contents/ui/main.qml +++ b/plasmoid/package/contents/ui/main.qml @@ -868,7 +868,7 @@ Item { target: icList - property int maxSize: (root.hoveredIndex>=0 && !root.dragSource) ? + property int maxSize: ((root.hoveredIndex>=0 || dockHoveredIndex>=0 ) && !root.dragSource) ? root.statesLineSize + root.zoomFactor * (root.iconSize + root.thickMargin) : root.statesLineSize + root.iconSize + root.thickMargin