diff --git a/containment/package/contents/ui/applet/ParabolicArea.qml b/containment/package/contents/ui/applet/ParabolicArea.qml index d4b01ba13..a0339978a 100644 --- a/containment/package/contents/ui/applet/ParabolicArea.qml +++ b/containment/package/contents/ui/applet/ParabolicArea.qml @@ -61,12 +61,11 @@ Item { root.showTooltipLabel(appletItem, applet.title); } - if (appletItem.originalAppletBehavior || communicator.requires.parabolicEffectLocked || !parabolicEffectIsSupported) { - return; - } - - if (!appletItem.myView.isShownFully || (root.latteApplet - && (root.latteApplet.noTasksInAnimation>0 || root.latteApplet.contextMenu))) { + if (!appletItem.myView.isShownFully + || appletItem.originalAppletBehavior + || !appletItem.parabolicEffectIsSupported + || communicator.requires.parabolicEffectLocked + || communicator.indexerIsSupported) { return; } @@ -80,8 +79,11 @@ Item { } onParabolicMove: { - if (!appletItem.myView.isShownFully || (root.latteApplet - && (root.latteApplet.noTasksInAnimation>0 || root.latteApplet.contextMenu))) { + if (!appletItem.myView.isShownFully + || appletItem.originalAppletBehavior + || !appletItem.parabolicEffectIsSupported + || communicator.requires.parabolicEffectLocked + || communicator.indexerIsSupported) { return; } @@ -131,14 +133,12 @@ Item { function updateScale(nIndex, nScale, step){ if(appletItem && !appletItem.containsMouse && (appletItem.index === nIndex)){ - if ( ((parabolicEffectIsSupported && !appletItem.originalAppletBehavior) || appletItem.latteApplet) + if ( (parabolicEffectIsSupported && !appletItem.originalAppletBehavior && !appletItem.communicator.indexerIsSupported) && (applet && applet.status !== PlasmaCore.Types.HiddenStatus)){ - if(!appletItem.latteApplet){ - if(nScale >= 0) { - wrapper.zoomScale = nScale + step; - } else { - wrapper.zoomScale = wrapper.zoomScale + step; - } + if(nScale >= 0) { + wrapper.zoomScale = nScale + step; + } else { + wrapper.zoomScale = wrapper.zoomScale + step; } } } diff --git a/containment/package/contents/ui/debugger/DebugWindow.qml b/containment/package/contents/ui/debugger/DebugWindow.qml index 4ca922826..3c2e287a5 100644 --- a/containment/package/contents/ui/debugger/DebugWindow.qml +++ b/containment/package/contents/ui/debugger/DebugWindow.qml @@ -656,14 +656,6 @@ Window{ text: "--"//layoutsContainer.hoveredIndex } - Text{ - text: "Task Hovered"+space - } - - Text{ - text: "--"//root.latteAppletHoveredIndex - } - Text{ text: "In Normal State"+space } diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml index e8d29a562..77554ea2d 100644 --- a/containment/package/contents/ui/main.qml +++ b/containment/package/contents/ui/main.qml @@ -372,7 +372,6 @@ Item { return plasmoid.configuration.titleTooltips; } - property int tasksCount: latteApplet ? latteApplet.tasksCount : 0 ///END properties from latteApplet