respect disabled background for all cases

pull/4/head
Michail Vourlakos 6 years ago
parent 20b76a182c
commit 315a217d10

@ -334,7 +334,7 @@ Item{
opacity: { opacity: {
if (forceSolidness) { if (forceSolidness) {
return 1; return 1;
} else if (root.forcePanelForBusyBackground || root.forceTransparentPanel) { } else if (!root.userShowPanelBackground || root.forcePanelForBusyBackground || root.forceTransparentPanel) {
return 0; return 0;
} else { } else {
return plasmoid.configuration.panelTransparency / 100; return plasmoid.configuration.panelTransparency / 100;

@ -93,6 +93,7 @@ DragDrop.DropArea {
property bool forceSolidPanel: (latteView && latteView.visibility property bool forceSolidPanel: (latteView && latteView.visibility
&& Latte.WindowSystem.compositingActive && Latte.WindowSystem.compositingActive
&& !root.editMode && !root.editMode
&& userShowPanelBackground
&& ( (plasmoid.configuration.solidBackgroundForMaximized && !hasExpandedApplet && ( (plasmoid.configuration.solidBackgroundForMaximized && !hasExpandedApplet
&& (latteView.windowsTracker.existsWindowMaximized || latteView.windowsTracker.activeWindowTouching)) && (latteView.windowsTracker.existsWindowMaximized || latteView.windowsTracker.activeWindowTouching))
|| (hasExpandedApplet && plasmaBackgroundForPopups) )) || (hasExpandedApplet && plasmaBackgroundForPopups) ))
@ -105,7 +106,8 @@ DragDrop.DropArea {
&& !(latteView.windowsTracker.existsWindowMaximized || latteView.windowsTracker.activeWindowTouching) && !(latteView.windowsTracker.existsWindowMaximized || latteView.windowsTracker.activeWindowTouching)
&& !(hasExpandedApplet && zoomFactor===1 && plasmoid.configuration.panelSize===100) && !(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 themeColors: plasmoid.configuration.themeColors
property int windowColors: plasmoid.configuration.windowColors property int windowColors: plasmoid.configuration.windowColors

@ -806,6 +806,7 @@ PlasmaComponents.Page {
checked: plasmoid.configuration.solidBackgroundForMaximized checked: plasmoid.configuration.solidBackgroundForMaximized
tooltip: i18n("Background removes its transparency setting when a window is touching") tooltip: i18n("Background removes its transparency setting when a window is touching")
style: LatteExtraControls.LatteCheckBoxStyle{} style: LatteExtraControls.LatteCheckBoxStyle{}
enabled: showBackground.checked
visible: dialog.expertLevel visible: dialog.expertLevel
onClicked: { onClicked: {
@ -819,6 +820,7 @@ PlasmaComponents.Page {
text: i18n("Hide background when not touching any window") text: i18n("Hide background when not touching any window")
checked: plasmoid.configuration.backgroundOnlyOnMaximized checked: plasmoid.configuration.backgroundOnlyOnMaximized
tooltip: i18n("Background becomes transparent except when a window is touching") tooltip: i18n("Background becomes transparent except when a window is touching")
enabled: showBackground.checked
visible: dialog.expertLevel visible: dialog.expertLevel
onClicked: { onClicked: {
@ -832,6 +834,7 @@ PlasmaComponents.Page {
text: i18n("Hide background shadow for maximized windows") text: i18n("Hide background shadow for maximized windows")
checked: plasmoid.configuration.disablePanelShadowForMaximized checked: plasmoid.configuration.disablePanelShadowForMaximized
tooltip: i18n("Background shadows become hidden when a maximized window is touching the view") tooltip: i18n("Background shadows become hidden when a maximized window is touching the view")
enabled: showBackground.checked
visible: dialog.expertLevel visible: dialog.expertLevel
onClicked: { onClicked: {
@ -845,6 +848,7 @@ PlasmaComponents.Page {
text: i18n("Prefer opaque plasma background for popups") text: i18n("Prefer opaque plasma background for popups")
checked: plasmoid.configuration.plasmaBackgroundForPopups checked: plasmoid.configuration.plasmaBackgroundForPopups
tooltip: i18n("Background becomes opaque in plasma style") tooltip: i18n("Background becomes opaque in plasma style")
enabled: showBackground.checked
visible: dialog.expertLevel visible: dialog.expertLevel
onClicked: { onClicked: {

Loading…
Cancel
Save