diff --git a/containment/package/contents/ui/PanelBox.qml b/containment/package/contents/ui/PanelBox.qml index b91fcf2fe..a29230999 100644 --- a/containment/package/contents/ui/PanelBox.qml +++ b/containment/package/contents/ui/PanelBox.qml @@ -334,7 +334,7 @@ Item{ opacity: { if (forceSolidness) { return 1; - } else if (root.forcePanelForBusyBackground || root.forceTransparentPanel) { + } else if (!root.userShowPanelBackground || root.forcePanelForBusyBackground || root.forceTransparentPanel) { return 0; } else { return plasmoid.configuration.panelTransparency / 100; diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml index 1d2b6b9df..d8435ae05 100644 --- a/containment/package/contents/ui/main.qml +++ b/containment/package/contents/ui/main.qml @@ -93,6 +93,7 @@ DragDrop.DropArea { property bool forceSolidPanel: (latteView && latteView.visibility && Latte.WindowSystem.compositingActive && !root.editMode + && userShowPanelBackground && ( (plasmoid.configuration.solidBackgroundForMaximized && !hasExpandedApplet && (latteView.windowsTracker.existsWindowMaximized || latteView.windowsTracker.activeWindowTouching)) || (hasExpandedApplet && plasmaBackgroundForPopups) )) @@ -105,7 +106,8 @@ DragDrop.DropArea { && !(latteView.windowsTracker.existsWindowMaximized || latteView.windowsTracker.activeWindowTouching) && !(hasExpandedApplet && zoomFactor===1 && plasmoid.configuration.panelSize===100) - property bool forcePanelForBusyBackground: root.forceTransparentPanel && colorizerManager.mustBeShown && colorizerManager.backgroundIsBusy + property bool forcePanelForBusyBackground: userShowPanelBackground && root.forceTransparentPanel + && colorizerManager.mustBeShown && colorizerManager.backgroundIsBusy property int themeColors: plasmoid.configuration.themeColors property int windowColors: plasmoid.configuration.windowColors diff --git a/shell/package/contents/configuration/pages/AppearanceConfig.qml b/shell/package/contents/configuration/pages/AppearanceConfig.qml index 1293ed796..f12bb0ee7 100644 --- a/shell/package/contents/configuration/pages/AppearanceConfig.qml +++ b/shell/package/contents/configuration/pages/AppearanceConfig.qml @@ -806,6 +806,7 @@ PlasmaComponents.Page { checked: plasmoid.configuration.solidBackgroundForMaximized tooltip: i18n("Background removes its transparency setting when a window is touching") style: LatteExtraControls.LatteCheckBoxStyle{} + enabled: showBackground.checked visible: dialog.expertLevel onClicked: { @@ -819,6 +820,7 @@ PlasmaComponents.Page { text: i18n("Hide background when not touching any window") checked: plasmoid.configuration.backgroundOnlyOnMaximized tooltip: i18n("Background becomes transparent except when a window is touching") + enabled: showBackground.checked visible: dialog.expertLevel onClicked: { @@ -832,6 +834,7 @@ PlasmaComponents.Page { text: i18n("Hide background shadow for maximized windows") checked: plasmoid.configuration.disablePanelShadowForMaximized tooltip: i18n("Background shadows become hidden when a maximized window is touching the view") + enabled: showBackground.checked visible: dialog.expertLevel onClicked: { @@ -845,6 +848,7 @@ PlasmaComponents.Page { text: i18n("Prefer opaque plasma background for popups") checked: plasmoid.configuration.plasmaBackgroundForPopups tooltip: i18n("Background becomes opaque in plasma style") + enabled: showBackground.checked visible: dialog.expertLevel onClicked: {