From 6d08319c1005c477298664cda65132c25a01f617 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Thu, 22 Feb 2018 17:22:26 +0200 Subject: [PATCH] disable dynamicBackground for !compositing --disable also the panel opacity for !compositing --- containment/package/contents/ui/PanelBox.qml | 3 ++- containment/package/contents/ui/VisibilityManager.qml | 5 +++-- containment/package/contents/ui/main.qml | 3 ++- shell/package/contents/configuration/TweaksConfig.qml | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/containment/package/contents/ui/PanelBox.qml b/containment/package/contents/ui/PanelBox.qml index b66c71032..17bcf7025 100644 --- a/containment/package/contents/ui/PanelBox.qml +++ b/containment/package/contents/ui/PanelBox.qml @@ -265,7 +265,8 @@ Item{ anchors.fill:parent opacity: (root.solidPanel && !plasmoid.configuration.solidBackgroundForMaximized) || root.forceSolidPanel - || (root.hasExpandedApplet && root.zoomFactor===1 && plasmoid.configuration.panelSize===100) ? + || (root.hasExpandedApplet && root.zoomFactor===1 && plasmoid.configuration.panelSize===100) + || !Latte.WindowSystem.compositingActive ? 1 : plasmoid.configuration.panelTransparency / 100 property rect efGeometry: Qt.rect(-1,-1,0,0) diff --git a/containment/package/contents/ui/VisibilityManager.qml b/containment/package/contents/ui/VisibilityManager.qml index e0c321f78..c5b32e766 100644 --- a/containment/package/contents/ui/VisibilityManager.qml +++ b/containment/package/contents/ui/VisibilityManager.qml @@ -164,9 +164,10 @@ Item{ target: dock && dock.visibility ? dock.visibility : null property: "enabledDynamicBackground" when: dock && dock.visibility - value: root.backgroundOnlyOnMaximized + value: (root.backgroundOnlyOnMaximized || plasmoid.configuration.solidBackgroundForMaximized - || root.disablePanelShadowMaximized + || root.disablePanelShadowMaximized) + && Latte.WindowSystem.compositingActive } Connections{ diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml index 7854349b4..ff90f2a58 100644 --- a/containment/package/contents/ui/main.qml +++ b/containment/package/contents/ui/main.qml @@ -79,10 +79,11 @@ DragDrop.DropArea { property bool containsOnlyPlasmaTasks: false //this is flag to indicate when from tasks only a plasma based one is found property bool dockContainsMouse: dock && dock.visibility ? dock.visibility.containsMouse : false - property bool disablePanelShadowMaximized: plasmoid.configuration.disablePanelShadowForMaximized + property bool disablePanelShadowMaximized: plasmoid.configuration.disablePanelShadowForMaximized && Latte.WindowSystem.compositingActive property bool drawShadowsExternal: panelShadowsActive && behaveAsPlasmaPanel && !visibilityManager.inTempHiding property bool editMode: editModeVisual.inEditMode property bool forceSolidPanel: plasmoid.configuration.solidBackgroundForMaximized && dock && dock.visibility + && Latte.WindowSystem.compositingActive &&(dock.visibility.existsWindowMaximized || dock.visibility.existsWindowSnapped) property bool forceTransparentPanel: root.backgroundOnlyOnMaximized && !(dock.visibility.existsWindowMaximized || dock.visibility.existsWindowSnapped) diff --git a/shell/package/contents/configuration/TweaksConfig.qml b/shell/package/contents/configuration/TweaksConfig.qml index 964a0bfbb..7ab945466 100644 --- a/shell/package/contents/configuration/TweaksConfig.qml +++ b/shell/package/contents/configuration/TweaksConfig.qml @@ -90,6 +90,7 @@ PlasmaComponents.Page { ColumnLayout { spacing: units.smallSpacing Layout.rightMargin: units.smallSpacing * 2 + enabled: Latte.WindowSystem.compositingActive Header { text: i18n("Dynamic Background")