From e0707b684e9ceae7c7c18c14c72e00144fb7cbe9 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Tue, 3 Apr 2018 16:00:50 +0300 Subject: [PATCH] fix #956,take into account panel transparency --implementation of the design decisions described at issue #957. Panel Background and Dynamic Background options interact with each other concerning panel transparency and triggering of solidness or transparency. --- containment/package/contents/ui/PanelBox.qml | 1 - .../package/contents/configuration/TypeSelection.qml | 12 ++++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/containment/package/contents/ui/PanelBox.qml b/containment/package/contents/ui/PanelBox.qml index 415fefe19..f52148ad2 100644 --- a/containment/package/contents/ui/PanelBox.qml +++ b/containment/package/contents/ui/PanelBox.qml @@ -293,7 +293,6 @@ Item{ } readonly property bool forceSolidness: (root.solidPanel && !plasmoid.configuration.solidBackgroundForMaximized) || root.forceSolidPanel - || (root.hasExpandedApplet && root.zoomFactor===1 && plasmoid.configuration.panelSize===100) || !Latte.WindowSystem.compositingActive property rect efGeometry: Qt.rect(-1,-1,0,0) diff --git a/shell/package/contents/configuration/TypeSelection.qml b/shell/package/contents/configuration/TypeSelection.qml index 5a70d501a..b450d89ad 100644 --- a/shell/package/contents/configuration/TypeSelection.qml +++ b/shell/package/contents/configuration/TypeSelection.qml @@ -84,6 +84,12 @@ Grid { plasmoid.configuration.shrinkThickMargins = false; plasmoid.configuration.activeIndicator = Latte.Dock.InternalsIndicator; plasmoid.configuration.autoDecreaseIconSize = true; + + //! Dynamic Background + plasmoid.configuration.solidBackgroundForMaximized = false; + plasmoid.configuration.colorizeTransparentPanels = false; + plasmoid.configuration.backgroundOnlyOnMaximized = false; + plasmoid.configuration.disablePanelShadowForMaximized = false; } } } @@ -111,6 +117,12 @@ Grid { plasmoid.configuration.shrinkThickMargins = true; plasmoid.configuration.activeIndicator = Latte.Dock.NoneIndicator; plasmoid.configuration.autoDecreaseIconSize = false; + + //! Dynamic Background + plasmoid.configuration.solidBackgroundForMaximized = (plasmoid.configuration.panelTransparency !== 100 ? true : false); + plasmoid.configuration.colorizeTransparentPanels = false; + plasmoid.configuration.backgroundOnlyOnMaximized = false; + plasmoid.configuration.disablePanelShadowForMaximized = false; } } }