diff --git a/containment/package/contents/ui/colorizer/Manager.qml b/containment/package/contents/ui/colorizer/Manager.qml index 94a25f537..ff95e14d6 100644 --- a/containment/package/contents/ui/colorizer/Manager.qml +++ b/containment/package/contents/ui/colorizer/Manager.qml @@ -56,7 +56,11 @@ Loader{ } if (themeExtended) { - if (root.userShowPanelBackground && root.plasmaBackgroundForPopups && root.hasExpandedApplet) { + if (root.userShowPanelBackground && root.plasmaBackgroundForPopups && root.hasExpandedApplet /*for expanded popups when it is enabled*/ + || (root.themeColors === Latte.Types.SmartThemeColors /*for Smart theming that Windows colors are not used and the user wants solidness at some cases*/ + && root.windowColors === Latte.Types.NoneWindowColors + && root.forceSolidPanel) ) { + /* plasma style*/ return theme; } diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml index 9c69768b0..74677a807 100644 --- a/containment/package/contents/ui/main.qml +++ b/containment/package/contents/ui/main.qml @@ -105,7 +105,8 @@ DragDrop.DropArea { && Latte.WindowSystem.compositingActive && !root.editMode && userShowPanelBackground - && ( (plasmoid.configuration.solidBackgroundForMaximized && !hasExpandedApplet + && ( (plasmoid.configuration.solidBackgroundForMaximized + && !(hasExpandedApplet && !plasmaBackgroundForPopups) && (latteView.windowsTracker.existsWindowMaximized || latteView.windowsTracker.activeWindowTouching)) || (hasExpandedApplet && plasmaBackgroundForPopups) )) || !Latte.WindowSystem.compositingActive @@ -114,9 +115,9 @@ DragDrop.DropArea { && latteView && latteView.visibility && Latte.WindowSystem.compositingActive && !root.editMode + && !forceSolidPanel && !(windowColors === Latte.Types.TouchingWindowColors && (latteView.windowsTracker.existsWindowMaximized || latteView.windowsTracker.activeWindowTouching)) && !(windowColors === Latte.Types.ActiveWindowColors && latteView.windowsTracker.existsWindowActive) - && !(hasExpandedApplet && zoomFactor===1 && plasmoid.configuration.panelSize===100) property bool forcePanelForBusyBackground: userShowPanelBackground && root.forceTransparentPanel && colorizerManager.mustBeShown && colorizerManager.backgroundIsBusy