remove deprecated apis from containment

work/spdx
Michail Vourlakos 4 years ago
parent f72a1d75c1
commit f0558d80b1

@ -61,12 +61,11 @@ Item {
root.showTooltipLabel(appletItem, applet.title); root.showTooltipLabel(appletItem, applet.title);
} }
if (appletItem.originalAppletBehavior || communicator.requires.parabolicEffectLocked || !parabolicEffectIsSupported) { if (!appletItem.myView.isShownFully
return; || appletItem.originalAppletBehavior
} || !appletItem.parabolicEffectIsSupported
|| communicator.requires.parabolicEffectLocked
if (!appletItem.myView.isShownFully || (root.latteApplet || communicator.indexerIsSupported) {
&& (root.latteApplet.noTasksInAnimation>0 || root.latteApplet.contextMenu))) {
return; return;
} }
@ -80,8 +79,11 @@ Item {
} }
onParabolicMove: { onParabolicMove: {
if (!appletItem.myView.isShownFully || (root.latteApplet if (!appletItem.myView.isShownFully
&& (root.latteApplet.noTasksInAnimation>0 || root.latteApplet.contextMenu))) { || appletItem.originalAppletBehavior
|| !appletItem.parabolicEffectIsSupported
|| communicator.requires.parabolicEffectLocked
|| communicator.indexerIsSupported) {
return; return;
} }
@ -131,14 +133,12 @@ Item {
function updateScale(nIndex, nScale, step){ function updateScale(nIndex, nScale, step){
if(appletItem && !appletItem.containsMouse && (appletItem.index === nIndex)){ 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)){ && (applet && applet.status !== PlasmaCore.Types.HiddenStatus)){
if(!appletItem.latteApplet){ if(nScale >= 0) {
if(nScale >= 0) { wrapper.zoomScale = nScale + step;
wrapper.zoomScale = nScale + step; } else {
} else { wrapper.zoomScale = wrapper.zoomScale + step;
wrapper.zoomScale = wrapper.zoomScale + step;
}
} }
} }
} }

@ -656,14 +656,6 @@ Window{
text: "--"//layoutsContainer.hoveredIndex text: "--"//layoutsContainer.hoveredIndex
} }
Text{
text: "Task Hovered"+space
}
Text{
text: "--"//root.latteAppletHoveredIndex
}
Text{ Text{
text: "In Normal State"+space text: "In Normal State"+space
} }

@ -372,7 +372,6 @@ Item {
return plasmoid.configuration.titleTooltips; return plasmoid.configuration.titleTooltips;
} }
property int tasksCount: latteApplet ? latteApplet.tasksCount : 0
///END properties from latteApplet ///END properties from latteApplet

Loading…
Cancel
Save