From 7c51065fcb7bf32e9cd15218555dd600ffdd15d7 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sat, 20 May 2017 22:54:36 +0300 Subject: [PATCH] fix #468,lock parabolic animation !editMode --lock properly the parabolic animation for Tasks plasmoid when the user right clicks the plasmoid --- plasmoid/package/contents/ui/main.qml | 2 +- plasmoid/package/contents/ui/task/TaskDelegate.qml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml index 69bea1bc0..718614de2 100644 --- a/plasmoid/package/contents/ui/main.qml +++ b/plasmoid/package/contents/ui/main.qml @@ -57,7 +57,7 @@ Item { property bool globalDirectRender: latteDock ? latteDock.globalDirectRender : icList.directRender property bool directRenderTimerIsRunning: latteDock ? latteDock.directRenderTimerIsRunning : enableDirectRenderTimer.running - property bool editMode: plasmoid.userConfiguring + property bool editMode: latteDock ? latteDock.editMode : plasmoid.userConfiguring property bool disableRestoreZoom: false //blocks restore animation in rightClick property bool dropNewLauncher: false property bool hasInternalSeparator: false diff --git a/plasmoid/package/contents/ui/task/TaskDelegate.qml b/plasmoid/package/contents/ui/task/TaskDelegate.qml index d18df26bd..9bb75e374 100644 --- a/plasmoid/package/contents/ui/task/TaskDelegate.qml +++ b/plasmoid/package/contents/ui/task/TaskDelegate.qml @@ -373,6 +373,9 @@ MouseArea{ ///////////////// Mouse Area Events /////////////////// onEntered: { + if (root.editMode) + return; + if ((icList.hoveredIndex !== itemIndex) && isLauncher && windowsPreviewDlg.visible) { windowsPreviewDlg.hide(1); } @@ -419,6 +422,9 @@ MouseArea{ } onPositionChanged: { + if (root.editMode) + return; + if(!root.latteDock) checkListHovered.stop();