From 8525e076f838c987ffebdc8f7533f8ae82aa16b0 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Tue, 12 May 2020 10:00:11 +0300 Subject: [PATCH] Tasks,dont mask out zoomed items too soon --AppletItem::clip was introduced in order to avoid circumstances that applets exceed their limits and as such still events from surrounding applets. Because of that change applets should now apply their layout properties as valid all the time --- containment/package/contents/ui/abilities/Animations.qml | 1 - declarativeimports/abilities/applets/Animations.qml | 2 +- declarativeimports/abilities/definitions/Animations.qml | 2 +- plasmoid/package/contents/ui/abilities/Animations.qml | 1 + plasmoid/package/contents/ui/main.qml | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/containment/package/contents/ui/abilities/Animations.qml b/containment/package/contents/ui/abilities/Animations.qml index f09b80720..16f98be0f 100644 --- a/containment/package/contents/ui/abilities/Animations.qml +++ b/containment/package/contents/ui/abilities/Animations.qml @@ -40,7 +40,6 @@ ContainerAbility.Animations { //! Public Properties active: plasmoid.configuration.animationsEnabled && LatteCore.WindowSystem.compositingActive - hasThicknessAnimation: (needBothAxis.count>0) || (needThickness.count>0) duration.large: LatteCore.Environment.longDuration duration.proposed: speedFactor.current * 2.8 * duration.large diff --git a/declarativeimports/abilities/applets/Animations.qml b/declarativeimports/abilities/applets/Animations.qml index 3cb870a86..018135111 100644 --- a/declarativeimports/abilities/applets/Animations.qml +++ b/declarativeimports/abilities/applets/Animations.qml @@ -25,7 +25,7 @@ AbilityDefinition.Animations { property Item bridge: null active: ref.animations.active - hasThicknessAnimation: ref.animations.hasThicknessAnimation + readonly property bool hasThicknessAnimation: ref.animations.hasThicknessAnimation //redefined to make it readonly and switchable //! animations tracking needBothAxis: ref.animations.needBothAxis diff --git a/declarativeimports/abilities/definitions/Animations.qml b/declarativeimports/abilities/definitions/Animations.qml index aca39010a..b87554bab 100644 --- a/declarativeimports/abilities/definitions/Animations.qml +++ b/declarativeimports/abilities/definitions/Animations.qml @@ -23,7 +23,7 @@ import "./animations" as AnimationsTypes Item { property bool active: false - property bool hasThicknessAnimation: false + readonly property bool hasThicknessAnimation: (needBothAxis.count>0) || (needThickness.count>0) //! animations properties property AnimationsTypes.Duration duration: AnimationsTypes.Duration { diff --git a/plasmoid/package/contents/ui/abilities/Animations.qml b/plasmoid/package/contents/ui/abilities/Animations.qml index 78a6499ad..6edf4adb7 100644 --- a/plasmoid/package/contents/ui/abilities/Animations.qml +++ b/plasmoid/package/contents/ui/abilities/Animations.qml @@ -43,5 +43,6 @@ AppletAbility.Animations { readonly property bool newWindowSlidingEnabled: active && plasmoid.configuration.animationNewWindowSliding readonly property bool windowAddedInGroupEnabled: active && plasmoid.configuration.animationWindowAddedInGroup readonly property bool windowRemovedFromGroupEnabled: active && plasmoid.configuration.animationWindowRemovedFromGroup + } diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml index b1da78db7..9816e4ff9 100644 --- a/plasmoid/package/contents/ui/main.qml +++ b/plasmoid/package/contents/ui/main.qml @@ -1132,8 +1132,8 @@ Item { visible: root.dragAreaEnabled - property int maxSize: ((parabolic.local.lastIndex>=0 || windowPreviewIsShown) && !root.dragSource) ? - (parabolic.factor.zoom * metrics.totals.thickness) + metrics.margin.screenEdge : + property int maxSize: ((parabolic.local.lastIndex>=0 || windowPreviewIsShown || animations.hasThicknessAnimation) && !root.dragSource) ? + (parabolic.factor.maxZoom * metrics.totals.thickness) + metrics.margin.screenEdge : metrics.totals.thickness + metrics.margin.screenEdge function onlyLaunchersInList(list){