From e9be1a9108ae316470b8476f118ba690a9b7ea50 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Tue, 9 Jan 2018 20:27:32 +0200 Subject: [PATCH] fix #833,block attention bouncing inAttention --fixed a typo to check the above case and at more checks also to be sure --- plasmoid/package/contents/ui/task/TaskWrapper.qml | 6 ++++-- .../contents/ui/task/animations/TaskNewWindowAnimation.qml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plasmoid/package/contents/ui/task/TaskWrapper.qml b/plasmoid/package/contents/ui/task/TaskWrapper.qml index 97f5047f5..8ceb8f5ac 100644 --- a/plasmoid/package/contents/ui/task/TaskWrapper.qml +++ b/plasmoid/package/contents/ui/task/TaskWrapper.qml @@ -158,7 +158,8 @@ Item{ Loader{ id: firstPadding - active: secondIndicator.active && (mainItemContainer.inAttentionAnimation || mainItemContainer.inFastRestoreAnimation) + active: secondIndicator.active && !root.reverseLinesPosition + && (mainItemContainer.inAttentionAnimation || mainItemContainer.inFastRestoreAnimation) visible: active sourceComponent: Component{ @@ -185,7 +186,8 @@ Item{ Loader{ id: secondPadding - active: firstIndicator.active && (mainItemContainer.inAttentionAnimation || mainItemContainer.inFastRestoreAnimation) + active: firstIndicator.active && !root.reverseLinesPosition + && (mainItemContainer.inAttentionAnimation || mainItemContainer.inFastRestoreAnimation) visible: active sourceComponent: Component{ diff --git a/plasmoid/package/contents/ui/task/animations/TaskNewWindowAnimation.qml b/plasmoid/package/contents/ui/task/animations/TaskNewWindowAnimation.qml index 0bebed868..e7efc43db 100644 --- a/plasmoid/package/contents/ui/task/animations/TaskNewWindowAnimation.qml +++ b/plasmoid/package/contents/ui/task/animations/TaskNewWindowAnimation.qml @@ -118,7 +118,7 @@ SequentialAnimation{ function bounceNewWindow(){ //if (isDemandingAttention && !root.dockIsHidden && (root.zoomFactor > 1)){ - if (!root.dockIsHidden && (root.zoomFactor > 1) && (root.durationTime>0) && !root.reverseLinesPositionasfa){ + if (!root.dockIsHidden && (root.zoomFactor > 1) && (root.durationTime>0) && !root.reverseLinesPosition){ newWindowAnimation.init(); start(); }