From d72745910a4ec8d9e01bc5870ca63528c56b3f71 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Fri, 20 Dec 2019 15:59:26 +0200 Subject: [PATCH] improve panel background is shown identification --- containment/package/contents/ui/PanelBox.qml | 2 ++ containment/package/contents/ui/VisibilityManager.qml | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/containment/package/contents/ui/PanelBox.qml b/containment/package/contents/ui/PanelBox.qml index d6c1e80b1..90a146dfd 100644 --- a/containment/package/contents/ui/PanelBox.qml +++ b/containment/package/contents/ui/PanelBox.qml @@ -41,6 +41,8 @@ Item{ opacity: root.useThemePanel ? 1 : 0 + readonly property bool isShown: (solidBackground.opacity > 0) || (overlayedBackground.opacity > 0) + property int animationTime: 6*root.durationTime*units.shortDuration property int lengthMargins: { diff --git a/containment/package/contents/ui/VisibilityManager.qml b/containment/package/contents/ui/VisibilityManager.qml index ff157e9a7..724f16c59 100644 --- a/containment/package/contents/ui/VisibilityManager.qml +++ b/containment/package/contents/ui/VisibilityManager.qml @@ -190,8 +190,7 @@ Item{ var isTouchingTopScreenEdge = (latteView.y === latteView.screenGeometry.y); var hasTopBorder = ((latteView.effects && (latteView.effects.enabledBorders & PlasmaCore.FrameSvg.TopBorder)) > 0); - return root.isVertical && !latteView.visibility.isHidden && !isTouchingTopScreenEdge && !hasTopBorder - && (root.forcePanelForBusyBackground || root.forceSolidPanel); + return root.isVertical && !latteView.visibility.isHidden && !isTouchingTopScreenEdge && !hasTopBorder && panelBoxBackground.isShown; } } @@ -206,8 +205,7 @@ Item{ var hasBottomBorder = ((latteView.effects && (latteView.effects.enabledBorders & PlasmaCore.FrameSvg.BottomBorder)) > 0); - return root.isVertical && !latteView.visibility.isHidden && !isTouchingBottomScreenEdge && !hasBottomBorder - && (root.forcePanelForBusyBackground || root.forceSolidPanel); + return root.isVertical && !latteView.visibility.isHidden && !isTouchingBottomScreenEdge && !hasBottomBorder && panelBoxBackground.isShown; } }