From 4501cb6eec3e807d23da134d20ad5187f58f0400 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Tue, 30 Jul 2019 16:29:42 +0300 Subject: [PATCH] fix "Disabled KWin edges" for !compositing BUG:410370 --- .../package/contents/ui/VisibilityManager.qml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/containment/package/contents/ui/VisibilityManager.qml b/containment/package/contents/ui/VisibilityManager.qml index 562380473..72dc3b3af 100644 --- a/containment/package/contents/ui/VisibilityManager.qml +++ b/containment/package/contents/ui/VisibilityManager.qml @@ -507,32 +507,34 @@ Item{ if (root.isVertical) { maskThickness = maskArea.width; } - } else if (!noCompositingEdit){ + } else if (!noCompositingEdit){ //! no compositing case - if (!latteView.visibility.isHidden || !latteView.visibility.supportsKWinEdges) { + var overridesHidden = latteView.visibility.isHidden && !latteView.visibility.supportsKWinEdges; + + if (!overridesHidden) { localX = latteView.effects.rect.x; localY = latteView.effects.rect.y; } else { if (plasmoid.location === PlasmaCore.Types.BottomEdge) { localX = latteView.effects.rect.x; - localY = latteView.effects.rect.y+latteView.effects.rect.height+thicknessAutoHidden; + localY = root.height - thicknessAutoHidden; } else if (plasmoid.location === PlasmaCore.Types.TopEdge) { localX = latteView.effects.rect.x; - localY = latteView.effects.rect.y - thicknessAutoHidden; + localY = 0; } else if (plasmoid.location === PlasmaCore.Types.LeftEdge) { - localX = latteView.effects.rect.x - thicknessAutoHidden; + localX = 0; localY = latteView.effects.rect.y; } else if (plasmoid.location === PlasmaCore.Types.RightEdge) { - localX = latteView.effects.rect.x + latteView.effects.rect.width + 1; + localX = root.width - thicknessAutoHidden; localY = latteView.effects.rect.y; } } if (root.isHorizontal) { - tempThickness = latteView.effects.rect.height; + tempThickness = overridesHidden ? thicknessAutoHidden : latteView.effects.rect.height; tempLength = latteView.effects.rect.width; } else { - tempThickness = latteView.effects.rect.width; + tempThickness = overridesHidden ? thicknessAutoHidden : latteView.effects.rect.width; tempLength = latteView.effects.rect.height; } }