From b6f6e7f15a2e947a85ee122ea789336978ededc3 Mon Sep 17 00:00:00 2001 From: ivan tkachenko Date: Tue, 2 Aug 2022 16:58:34 +0300 Subject: [PATCH] effects/desktopgrid: Fix panel opacity animation during transition It did fade back in, but at the beginning of animation it used to just instantly disappear. FIXED-IN: 5.25.5 5.26 --- src/effects/desktopgrid/qml/DesktopView.qml | 7 ------- src/effects/desktopgrid/qml/main.qml | 9 ++++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/effects/desktopgrid/qml/DesktopView.qml b/src/effects/desktopgrid/qml/DesktopView.qml index 4f4fc1d244..b2f93537da 100644 --- a/src/effects/desktopgrid/qml/DesktopView.qml +++ b/src/effects/desktopgrid/qml/DesktopView.qml @@ -73,13 +73,6 @@ FocusScope { height: model.client.height z: model.client.stackingOrder opacity: model.client.dock ? desktopView.panelOpacity : 1 - Behavior on opacity { - enabled: !container.effect.gestureInProgress - OpacityAnimator { - duration: container.effect.animationDuration - easing.type: Easing.InOutCubic - } - } } } diff --git a/src/effects/desktopgrid/qml/main.qml b/src/effects/desktopgrid/qml/main.qml index e9f2afd613..d7af5f2649 100644 --- a/src/effects/desktopgrid/qml/main.qml +++ b/src/effects/desktopgrid/qml/main.qml @@ -155,7 +155,7 @@ Rectangle { property Item currentItem readonly property real targetScale : 1 / Math.max(rows, columns) - property real panelOpacity + property real panelOpacity: 1 Behavior on x { enabled: !container.effect.gestureInProgress @@ -178,6 +178,13 @@ Rectangle { easing.type: Easing.InOutCubic } } + Behavior on panelOpacity { + enabled: !container.effect.gestureInProgress + NumberAnimation { + duration: container.effect.animationDuration + easing.type: Easing.InOutCubic + } + } width: parent.width * columns height: parent.height * rows