diff --git a/plasmoid/package/contents/ui/GlowPoint.qml b/plasmoid/package/contents/ui/GlowPoint.qml index 4f5a4cade..1c7d063eb 100644 --- a/plasmoid/package/contents/ui/GlowPoint.qml +++ b/plasmoid/package/contents/ui/GlowPoint.qml @@ -26,12 +26,12 @@ import QtGraphicalEffects 1.0 Item{ // property string color - id: glowItem + id: glowItem property bool roundCorners: true property bool showAttention: false - property int animation: root.durationTime*units.longDuration + property int animation: Math.max(1.65*3*units.longDuration,root.durationTime*3*units.longDuration) property color attentionColor: colorScopePalette.negativeTextColor // "#ffff1717" property color basicColor: "blue" @@ -74,7 +74,7 @@ Item{ duration: glowItem.animation easing.type: Easing.InOutQuad } - } + } } RectangularGlow { @@ -99,6 +99,4 @@ Item{ }*/ } - - } diff --git a/plasmoid/package/contents/ui/TaskGroupItem.qml b/plasmoid/package/contents/ui/TaskGroupItem.qml index 7f0d87f78..56214e9ee 100644 --- a/plasmoid/package/contents/ui/TaskGroupItem.qml +++ b/plasmoid/package/contents/ui/TaskGroupItem.qml @@ -66,7 +66,7 @@ Item{ glowFrame.isActiveColor : glowFrame.notActiveColor roundCorners: true - showAttention: model.IsDemandingAttention ? true : false + showAttention: model.IsDemandingAttention && plasmoid.status === PlasmaCore.Types.RequiresAttentionStatus? true : false opacity: (!mainItemContainer.hasActive && root.showPreviews && windowsPreviewDlg.activeItem && (windowsPreviewDlg.activeItem === mainItemContainer)) ? 0.4 : 1 diff --git a/plasmoid/package/contents/ui/TaskIconItem.qml b/plasmoid/package/contents/ui/TaskIconItem.qml index ee24ed1ce..6fa5649dc 100644 --- a/plasmoid/package/contents/ui/TaskIconItem.qml +++ b/plasmoid/package/contents/ui/TaskIconItem.qml @@ -763,18 +763,6 @@ Item{ ////////////////// new window and needs attention animation - //stop the bouncing animation for attention needed when the plasmoid - //does not need any more attention - Connections{ - target: plasmoid - onStatusChanged:{ - if ( (plasmoid.status === PlasmaCore.Types.PassiveStatus) - && newWindowAnimation.running && (newWindowAnimation.loops > 2) ) { - newWindowAnimation.clear(); - } - } - } - Connections{ target: mainItemContainer onContainsMouseChanged: { @@ -818,6 +806,18 @@ Item{ duration: 3*root.durationTime*newWindowAnimation.speed easing.type: Easing.OutBounce } + + ScriptAction{ + script:{ + if (mainItemContainer.containsMouse) { + newWindowAnimation.stop(); + } + if (!newWindowAnimation.isDemandingAttention + || (plasmoid.status === PlasmaCore.Types.PassiveStatus && newWindowAnimation.loops > 2)){ + newWindowAnimation.clear(); + } + } + } } function clear(){ @@ -835,11 +835,7 @@ Item{ } onIsDemandingAttentionChanged: { - if( (!isDemandingAttention)&&(running)){ - clear(); - // wrapper.animationEnded(); - } - else if(isDemandingAttention){ + if(isDemandingAttention){ bounceNewWindow(); } } diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml index 81944e662..1c64b0e64 100644 --- a/plasmoid/package/contents/ui/main.qml +++ b/plasmoid/package/contents/ui/main.qml @@ -660,7 +660,7 @@ Item { id: attentionTimerComponent Timer{ id: attentionTimer - interval:6500 + interval:8500 onTriggered: { plasmoid.status = PlasmaCore.Types.PassiveStatus; destroy();