From 71d3979f0c13e9086825d332a10d2440eeb3c189 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sun, 24 Mar 2019 20:23:03 +0200 Subject: [PATCH] separate liveEditingMode and inConfigureApplets --try to improve experience for liveEditingMode and inConfigureApplets. LiveEditingMode should be as much as nearer to the standard experience and inConfigureApplets state should provide nice coloring --- containment/package/contents/ui/colorizer/Manager.qml | 3 ++- containment/package/contents/ui/main.qml | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/containment/package/contents/ui/colorizer/Manager.qml b/containment/package/contents/ui/colorizer/Manager.qml index 2973fea85..a89f51627 100644 --- a/containment/package/contents/ui/colorizer/Manager.qml +++ b/containment/package/contents/ui/colorizer/Manager.qml @@ -112,7 +112,8 @@ Loader{ readonly property color backgroundColor:applyTheme.backgroundColor readonly property color textColor: { - if (latteView && latteView.managedLayout && root.inConfigureAppletsMode && (root.themeColors === Latte.Types.SmartThemeColors)) { + if (latteView && latteView.managedLayout && root.inConfigureAppletsMode && root.panelTransparency<40 + && (root.themeColors === Latte.Types.SmartThemeColors)) { return latteView.managedLayout.textColor; } diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml index 26112a820..d99761841 100644 --- a/containment/package/contents/ui/main.qml +++ b/containment/package/contents/ui/main.qml @@ -106,7 +106,7 @@ DragDrop.DropArea { property bool forceSolidPanel: (latteView && latteView.visibility && Latte.WindowSystem.compositingActive - && !root.editMode + && !inConfigureAppletsMode && userShowPanelBackground && ( (plasmoid.configuration.solidBackgroundForMaximized && !(hasExpandedApplet && !plasmaBackgroundForPopups) @@ -117,7 +117,7 @@ DragDrop.DropArea { property bool forceTransparentPanel: root.backgroundOnlyOnMaximized && latteView && latteView.visibility && Latte.WindowSystem.compositingActive - && !root.editMode + && !inConfigureAppletsMode && !forceSolidPanel && !(windowColors === Latte.Types.TouchingWindowColors && latteView.windowsTracker.activeWindowTouching) && !(windowColors === Latte.Types.ActiveWindowColors && latteView.windowsTracker.existsWindowActive) @@ -230,7 +230,7 @@ DragDrop.DropArea { return false; } - if (root.editMode) { + if (inConfigureAppletsMode) { return plasmoid.configuration.panelShadows; }