enable Blur in LiveMode

pull/5/head
Michail Vourlakos 6 years ago
parent b3af2cf176
commit 9615c7362b

@ -295,6 +295,7 @@ Item{
Image{ Image{
id: backTiler id: backTiler
anchors.fill: parent anchors.fill: parent
visible: false
fillMode: Image.Tile fillMode: Image.Tile
source: hasBackground ? latteView.managedLayout.background : "../icons/"+editModeVisual.layoutColor+"print.jpg" source: hasBackground ? latteView.managedLayout.background : "../icons/"+editModeVisual.layoutColor+"print.jpg"
@ -305,17 +306,20 @@ Item{
ShaderEffectSource { ShaderEffectSource {
id: effectSource id: effectSource
anchors.fill: backTiler
visible: false
sourceItem: backTiler sourceItem: backTiler
anchors.fill: backTiler
sourceRect: Qt.rect(0,0, width, height) sourceRect: Qt.rect(0,0, width, height)
} }
FastBlur{ FastBlur{
id: blur id: blur
anchors.fill: effectSource anchors.fill: effectSource
opacity: editModeVisual.opacity * 1.5
source: effectSource source: effectSource
radius: 35 radius: 50
} }
} }
} }
@ -395,7 +399,7 @@ Item{
} }
function updateEffectsArea(){ function updateEffectsArea(){
if (!latteView || root.editMode) if (!latteView)
return; return;
var rootGeometry = mapToItem(root, 0, 0); var rootGeometry = mapToItem(root, 0, 0);

@ -150,7 +150,7 @@ Item{
target: latteView && latteView.effects ? latteView.effects : null target: latteView && latteView.effects ? latteView.effects : null
property: "drawEffects" property: "drawEffects"
when: latteView && latteView.effects when: latteView && latteView.effects
value: Latte.WindowSystem.compositingActive && !editModeVisual.inEditMode && value: Latte.WindowSystem.compositingActive &&
(((root.blurEnabled && root.useThemePanel) (((root.blurEnabled && root.useThemePanel)
|| (root.blurEnabled && root.forceSolidPanel && Latte.WindowSystem.compositingActive)) || (root.blurEnabled && root.forceSolidPanel && Latte.WindowSystem.compositingActive))
&& (!root.inStartup || inForceHiding || inTempHiding)) && (!root.inStartup || inForceHiding || inTempHiding))

@ -166,8 +166,9 @@ Item{
MouseArea { MouseArea {
id: editBackMouseArea id: editBackMouseArea
anchors.fill: parent anchors.fill: parent
visible: editModeVisual.editAnimationEnded
property bool wheelIsBlocked: false; property bool wheelIsBlocked: false;
readonly property double opacityStep: 0.1 readonly property double opacityStep: 0.1
@ -245,8 +246,10 @@ Item{
} }
function updateEffectsArea(){ function updateEffectsArea(){
if (!latteView || state !== "edit" || !editAnimationEnded) if (Latte.WindowSystem.compositingActive ||
!latteView || state !== "edit" || !editAnimationEnded) {
return; return;
}
var rootGeometry = mapToItem(root, 0, 0); var rootGeometry = mapToItem(root, 0, 0);

Loading…
Cancel
Save