diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml index d6ee94d6b..e32f87eb8 100644 --- a/containment/package/contents/ui/applet/AppletItem.qml +++ b/containment/package/contents/ui/applet/AppletItem.qml @@ -94,7 +94,6 @@ Item { property int spacersMaxSize: Math.max(0,Math.ceil(0.5*root.iconSize) - root.iconMargin) property int status: applet ? applet.status : -1 - property real animationStep: Math.min(3, root.iconSize / 8) property real computeWidth: root.isVertical ? wrapper.width : hiddenSpacerLeft.width+wrapper.width+hiddenSpacerRight.width @@ -596,7 +595,7 @@ Item { if( ((wrapper.zoomScale == 1 || wrapper.zoomScale === root.zoomFactor) && !root.globalDirectRender) || root.globalDirectRender) { if (root.isHorizontal){ var step = Math.abs(layoutsContainer.currentSpot-mouse.x); - if (step >= container.animationStep){ + if (step >= root.animationStep){ layoutsContainer.hoveredIndex = index; layoutsContainer.currentSpot = mouse.x; @@ -605,7 +604,7 @@ Item { } else{ var step = Math.abs(layoutsContainer.currentSpot-mouse.y); - if (step >= container.animationStep){ + if (step >= root.animationStep){ layoutsContainer.hoveredIndex = index; layoutsContainer.currentSpot = mouse.y; diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml index 932afc56f..5180dd6b2 100644 --- a/containment/package/contents/ui/main.qml +++ b/containment/package/contents/ui/main.qml @@ -292,6 +292,7 @@ DragDrop.DropArea { readonly property bool hasInternalSeparator: latteApplet ? latteApplet.hasInternalSeparator : false property int activeIndicatorType: plasmoid.configuration.activeIndicatorType + property int animationStep: 1 // Math.min(3, root.iconSize / 8) // TO BE UPDATED WITH NEW UNIVERSAL SETTINGS OPTIONS IN EDITOR WINDOW property int glowOption: plasmoid.configuration.glowOption property real glowOpacity: plasmoid.configuration.glowOpacity/100 diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml index 9e7820a47..0cd1c7350 100644 --- a/plasmoid/package/contents/ui/main.qml +++ b/plasmoid/package/contents/ui/main.qml @@ -153,6 +153,7 @@ Item { property alias windowPreviewIsShown: windowsPreviewDlg.visible property int activeIndicatorType: latteDock ? latteDock.activeIndicatorType : Latte.Dock.LineIndicator + property int animationStep: latteDock ? latteDock.animationStep : 1 property int directRenderAnimationTime: latteDock ? latteDock.directRenderAnimationTime : 0 property int dockHoveredIndex : latteDock ? latteDock.hoveredIndex : -1 property int iconMargin: latteDock ? latteDock.iconMargin : 0.12*iconSize diff --git a/plasmoid/package/contents/ui/task/TaskDelegate.qml b/plasmoid/package/contents/ui/task/TaskDelegate.qml index a8c5eda50..6d8b32604 100644 --- a/plasmoid/package/contents/ui/task/TaskDelegate.qml +++ b/plasmoid/package/contents/ui/task/TaskDelegate.qml @@ -128,8 +128,6 @@ MouseArea{ property int resistanceDelay: 450 property int spacersMaxSize: Math.max(0,Math.ceil(0.55*root.iconSize) - root.iconMargin) - property real animationStep: Math.min(3, root.iconSize / 8) - property string activity: tasksModel.activity readonly property var m: model @@ -569,7 +567,7 @@ MouseArea{ if(root.dragSource == null){ if (icList.orientation == Qt.Horizontal){ var step = Math.abs(icList.currentSpot-mouse.x); - if (step >= animationStep){ + if (step >= root.animationStep){ icList.hoveredIndex = index; icList.currentSpot = mouse.x; @@ -578,7 +576,7 @@ MouseArea{ } else{ var step = Math.abs(icList.currentSpot-mouse.y); - if (step >= animationStep){ + if (step >= root.animationStep){ icList.hoveredIndex = index; icList.currentSpot = mouse.y;